From: Willem Liu <willem.liu@gmail.com>
Date: Sat, 30 Apr 2011 00:46:13 +0000 (+0200)
Subject: Fixed merge conflict
X-Git-Tag: easylist-0.3.25~6
X-Git-Url: https://vcs.maemo.org/git/?p=easylist;a=commitdiff_plain;h=refs%2Fheads%2Fmerge-requests%2F1

Fixed merge conflict
---

23e41b20283a01bfe0401078ce6092bb429d5cd8