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)
commit41fd47ed1e31e9c881ffde4cc9d29a83b70a8ee9
treee3d94729756d408f5bcd7e060a59dc797703611c
parentbc789ee4e6d2e3b613acba35633e421ea06bd565
parentbf7a4bc7fcdda1e09b89adbdbd888dbdc847267b
Merge "clean up User::getOptions a bit"