Merge "(bug 39383, bug 40059) Allowing badges to use strings and returning this"
authorOri.livneh <ori@wikimedia.org>
Fri, 9 Nov 2012 01:25:01 +0000 (01:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 Nov 2012 01:25:01 +0000 (01:25 +0000)

Trivial merge