Merge commit 'refs/merge-requests/196' of gitorious.org:f-droid/fdroiddata
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 13 Oct 2013 16:23:59 +0000 (18:23 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 13 Oct 2013 16:23:59 +0000 (18:23 +0200)
commit1e5476f1064f65a16f1e3b06d59ce5ea3803d49e
tree00111eece778c2965fa16b711d73c7366fbebc6e
parent5335d17b92210f81849ab67facbf51bc2161e540
parentb7545bbaf4114a96da585594e8428f8f2ca2a5ce
Merge commit 'refs/merge-requests/196' of gitorious.org:f-droid/fdroiddata
metadata/org.projectmaxs.transport.xmpp.txt