Merge "Make API action=tokens extendable"
authorDemon <chadh@wikimedia.org>
Wed, 25 Apr 2012 14:03:26 +0000 (14:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Apr 2012 14:03:26 +0000 (14:03 +0000)

Trivial merge