Merge branch 'master' of gitlab.com:JeroenVreeken/fdroiddata
authorJeroen Vreeken <jeroen@vreeken.net>
Tue, 8 Apr 2014 17:28:48 +0000 (19:28 +0200)
committerJeroen Vreeken <jeroen@vreeken.net>
Tue, 8 Apr 2014 17:28:48 +0000 (19:28 +0200)
commitc81bbd4e8a6154fe8677d47b53357724df6a741f
tree30e5bddcb48a199c3b21aea68bf5ae6a2141412e
parent775b40e2249e130ec376f6ea9a4f60cf14dfa2d9
parent8ddd40bbb0d16fc878fa80649678c6862eceedca
Merge branch 'master' of gitlab.com:JeroenVreeken/fdroiddata

Conflicts:
metadata/net.vreeken.quickmsg.txt
metadata/net.vreeken.quickmsg.txt