Merge "(bug 35993) gettoken should go die in a fire (part 1)"
authorBrion VIBBER <brion@wikimedia.org>
Tue, 8 May 2012 20:26:28 +0000 (20:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 May 2012 20:26:28 +0000 (20:26 +0000)

Trivial merge