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)
commite12974d6a2fbd6ddafbe4193a836b1c5113af4a9
treeed1d66585df035354a6fa514e30cbcf21168a553
parent36b1172147831e97d5fac21bf098016c2c0bee84
parent740a4cb4cdfb338cc31f8699ad348dc2238d07bc
Merge changes Id8107d24,I8c63dcc8

* changes:
  [mediawiki.action.watch] clean up
  [mediawiki.action.watch] Move re-used logic into local function * Follows-up r112440, r107969, r107350