From: daniel <daniel.kinzler@wikimedia.de>
Date: Mon, 25 Jun 2012 11:43:00 +0000 (+0200)
Subject: merged master
X-Git-Tag: 1.31.0-rc.0~22097^2^2~83
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f5b2f09ab0dd5c2d4a1e7d1fbdf7ab069b10ce28

merged master

Change-Id: I0323bdbc035962a6ac8f9473df8a6b72acf82b4c
---

f5b2f09ab0dd5c2d4a1e7d1fbdf7ab069b10ce28