Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorCiaran Gultnieks <ciaran@ciarang.com>
Wed, 2 Jan 2013 18:07:09 +0000 (18:07 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Wed, 2 Jan 2013 18:07:09 +0000 (18:07 +0000)
commit370a499253332b701075a95ba448eec22106fc42
tree7206cc3b64cdfe953bfc3751e04d55c8ca3968a1
parent11c183a5e6bcdc0c0fa16c658f05c16483886d80
parent370981c7e4c500a63e0ad812c1d3c29b20449fff
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/com.nononsenseapps.notepad.txt
metadata/com.nononsenseapps.notepad.txt