From: jeroendedauw <jeroendedauw@gmail.com>
Date: Wed, 11 Apr 2012 12:50:54 +0000 (+0200)
Subject: Merge branch 'Wikidata', remote-tracking branch 'origin/Wikidata' into Wikidata
X-Git-Tag: 1.31.0-rc.0~22097^2^2~247^2~5
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=718812052b45c23d3af93178f1ef2caa839410b4;p=lhc%2Fweb%2Fwiklou.git

Merge branch 'Wikidata', remote-tracking branch 'origin/Wikidata' into Wikidata
---