Merge "Update version to 1.21."
authorReedy <reedy@wikimedia.org>
Mon, 8 Oct 2012 20:39:35 +0000 (20:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 8 Oct 2012 20:39:35 +0000 (20:39 +0000)

Trivial merge