Merge "(bug 42638) Fix API action=options&reset=1 & unit tests"
authorKrinkle <ttijhof@wikimedia.org>
Tue, 4 Dec 2012 00:22:21 +0000 (00:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Dec 2012 00:22:21 +0000 (00:22 +0000)

Trivial merge