Merge commit 'refs/merge-requests/275' of gitorious.org:f-droid/fdroiddata
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 16 Dec 2013 08:29:44 +0000 (09:29 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 16 Dec 2013 08:29:44 +0000 (09:29 +0100)
commitc0686ca2702a47cb5f47f9b9fb9ec6832fea3e10
tree5c410d93fa8998378a7624b6901852e415156460
parentd324fb3fb57a88e964a99394dceaeb8e88ced6cc
parent10a8a1a6fca3d8e1cabf763aa47d9466a34fd24e
Merge commit 'refs/merge-requests/275' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/com.vlille.checker.txt
metadata/com.vlille.checker.txt