Merge "(bug 43959) Add ability to reset certain option kinds in API."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Jan 2013 18:49:04 +0000 (18:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Jan 2013 18:49:04 +0000 (18:49 +0000)

Trivial merge