Merge "Cache the result of User::getDefaultOptions"
authorDemon <chadh@wikimedia.org>
Mon, 29 Oct 2012 14:21:42 +0000 (14:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 29 Oct 2012 14:21:42 +0000 (14:21 +0000)

Trivial merge