Merge commit 'refs/merge-requests/378' of gitorious.org:f-droid/fdroiddata
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 2 Feb 2014 10:20:53 +0000 (11:20 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 2 Feb 2014 10:20:53 +0000 (11:20 +0100)
commitc38910730a41fbfc6f1831046efce02d3afa6642
tree136e75f8111f3c501b7678d28de053dbb67892f8
parentb9475a33c334fbcb22b51537d450947d3154ac36
parent2332940ba1ec12390e7147db460ab6371138693b
Merge commit 'refs/merge-requests/378' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/com.edwardoyarzun.diccionario.txt
metadata/com.edwardoyarzun.diccionario.txt