Merge changes Id8107d24,I8c63dcc8
authorDemon <chadh@wikimedia.org>
Fri, 23 Mar 2012 14:58:37 +0000 (14:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Mar 2012 14:58:37 +0000 (14:58 +0000)
* changes:
  [mediawiki.action.watch] clean up
  [mediawiki.action.watch] Move re-used logic into local function * Follows-up r112440, r107969, r107350


Trivial merge