Merge "Move action.watch to a more suitable place and expose updateWatchLink method...
authorTrevor Parscal <tparscal@wikimedia.org>
Wed, 20 Jun 2012 20:06:12 +0000 (20:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Jun 2012 20:06:12 +0000 (20:06 +0000)

Trivial merge