Merge "clean up User::getOptions a bit"
authorAaron Schulz <aschulz@wikimedia.org>
Sun, 3 Jun 2012 10:14:09 +0000 (10:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 3 Jun 2012 10:14:09 +0000 (10:14 +0000)

Trivial merge