Merge "Follow-up Ifd700826 (60d119c), address a fixme in a re-enabled test."
authorSiebrand <siebrand@wikimedia.org>
Sun, 23 Sep 2012 19:01:20 +0000 (19:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 23 Sep 2012 19:01:20 +0000 (19:01 +0000)

Trivial merge