From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 24 Jul 2013 21:28:18 +0000 (+0000)
Subject: Merge "User#getOption: Check ignoreHidden before $wgHiddenPrefs"
X-Git-Tag: 1.31.0-rc.0~19126
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=087dc60bdfb4b08829d666a96726b52afc4a471b;p=lhc%2Fweb%2Fwiklou.git

Merge "User#getOption: Check ignoreHidden before $wgHiddenPrefs"
---

087dc60bdfb4b08829d666a96726b52afc4a471b