Merge commit 'refs/merge-requests/377' of gitorious.org:f-droid/fdroiddata
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 2 Feb 2014 10:24:11 +0000 (11:24 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 2 Feb 2014 10:24:11 +0000 (11:24 +0100)
commit1b9167495a1941427b77b3f18ae437175a8a4b61
tree7c5b90123d5e75cac8d4b3f2c5ca12c0bebe24ab
parentc38910730a41fbfc6f1831046efce02d3afa6642
parent311af5670d840717b1a5a4576c109e3c774548ad
Merge commit 'refs/merge-requests/377' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/edu.harvard.android.mmskeeper.txt
metadata/edu.harvard.android.mmskeeper.txt