Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Tue, 21 Aug 2012 21:20:49 +0000 (22:20 +0100)
committerDavid Black <david8black@gmail.com>
Tue, 21 Aug 2012 21:20:49 +0000 (22:20 +0100)
commit8ad9524b08b75c626a11a7a47151ea6073ffac7d
treecc86d11d5852f5ff8afb5adcfc9da726b565ede7
parentb1ef447edeab215fc3226b1000072928a518a878
parent36257f9d7ee884ed31ed732b027f5e5ffd182a85
Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

Conflicts:
metadata/com.github.mobile.txt
metadata/csh.cryptonite.txt
metadata/mobi.cyann.nstools.txt
metadata/net.rocrail.androc.txt
metadata/no.rkkc.bysykkel.txt
metadata/org.projectvoodoo.simplecarrieriqdetector.txt
metadata/com.axelby.podax.txt
metadata/csh.cryptonite.txt
metadata/me.guillaumin.android.osmtracker.txt
metadata/net.exclaimindustries.geohashandroid.txt
metadata/net.mafro.android.wakeonlan.txt
metadata/net.rocrail.androc.txt
metadata/org.abrantix.rockon.rockonnggl.txt