Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorCiaran Gultnieks <ciaran@ciarang.com>
Sat, 15 Jun 2013 10:14:28 +0000 (11:14 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Sat, 15 Jun 2013 10:14:28 +0000 (11:14 +0100)
commit964ae994f7b3460dc42e3b3438b8ef6bc44b8909
treea39a27c1ccae468947cfef35b4673b30a53327db
parentcdb9ed8b6cb92d451a5cc73d5a163e2966120e85
parent7af0ab9105a3f42af8209f556de64ecc6eeb2ec8
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/fr.ybo.gtfsalert.txt