From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 3 Jun 2012 10:14:09 +0000 (+0000)
Subject: Merge "clean up User::getOptions a bit"
X-Git-Tag: 1.31.0-rc.0~23433
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=41fd47ed1e31e9c881ffde4cc9d29a83b70a8ee9;p=lhc%2Fweb%2Fwiklou.git

Merge "clean up User::getOptions a bit"
---

41fd47ed1e31e9c881ffde4cc9d29a83b70a8ee9