Merge "Fix possible error texts in action=options"
authorAaron Schulz <aschulz@wikimedia.org>
Sat, 4 Aug 2012 18:13:09 +0000 (18:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 4 Aug 2012 18:13:09 +0000 (18:13 +0000)

Trivial merge