Merge commit 'refs/merge-requests/15' of git://gitorious.org/f-droid/fdroiddata into...
authorCiaran Gultnieks <ciaran@ciarang.com>
Sun, 1 Jul 2012 07:25:08 +0000 (08:25 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Sun, 1 Jul 2012 07:25:08 +0000 (08:25 +0100)
commit2f4391dbcee951c2f05b7411ff7b7e84bc51c53a
tree7d07a48a1d94368db0d04730168dd84bc9181300
parenteb668338c247c20a3cc723b40d2557f6605e0cdc
parentff6654a177bbdfe6b2048ddb635dc1ef1bd4bcb5
Merge commit 'refs/merge-requests/15' of git://gitorious.org/f-droid/fdroiddata into merge-requests/15

Conflicts:
metadata/in.shick.lockpatterngenerator.txt
metadata/in.shick.lockpatterngenerator.txt