Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorCiaran Gultnieks <ciaran@ciarang.com>
Mon, 17 Jun 2013 09:07:54 +0000 (10:07 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Mon, 17 Jun 2013 09:07:54 +0000 (10:07 +0100)
commit8c8fe7ef392fa4dca0b75ebcf821fa23ff99e061
tree7eb5a9579a72b562537af9ff1f2d1bc32f3b180e
parente4cadaf63dd3adc889ac4832031fce664d833a8b
parent0386a1f5ad9bf5b58c62eea26b344d3d1dfad0e0
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/fr.ybo.transportsbordeaux.txt
metadata/fr.ybo.transportsrennes.txt
metadata/fr.ybo.transportsbordeaux.txt
metadata/fr.ybo.transportsrennes.txt
metadata/org.andstatus.app.txt
metadata/org.videolan.vlc.txt