Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Mon, 13 May 2013 10:18:46 +0000 (11:18 +0100)
committerDavid Black <david8black@gmail.com>
Mon, 13 May 2013 10:18:46 +0000 (11:18 +0100)
commit8cfce9506c0ac51ccfd0ffc1bab781dcf1e953ab
tree40e0384d53b802f27c8c7f2fe17192a1aaa73c4d
parentd76c1a9e573d1c7b4ef033349e1064f93001ba54
parentd0c5795d541d1ae21d442371429cce9d6d346eb7
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/com.veken0m.bitcoinium.txt