Merge commit 'refs/merge-requests/319' of https://gitorious.org/f-droid/fdroiddata...
authorCiaran Gultnieks <ciaran@ciarang.com>
Sat, 11 Jan 2014 10:17:50 +0000 (10:17 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Sat, 11 Jan 2014 10:17:50 +0000 (10:17 +0000)
commitb19971bc0b4c5b63681de3177f1762b487b059b8
tree7c54013f42068b3ac6366e386b83b68a751c29e7
parent4a3cd090d4e69527a692655b8bc54ba1d9e9e750
parentad2262e2e1c6e1b220eacee90b9b2905ec423923
Merge commit 'refs/merge-requests/319' of https://gitorious.org/f-droid/fdroiddata into merge-requests/319

Conflicts:
metadata/com.traffar.game_of_life.txt