Merge "Add months and years to Timestamp::getHumanTimestamp()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Jan 2013 08:28:41 +0000 (08:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Jan 2013 08:28:41 +0000 (08:28 +0000)

Trivial merge