Merge "Un-marking testMakeNormalBlock as broken..."
authorHashar <hashar@free.fr>
Fri, 6 Apr 2012 06:42:07 +0000 (06:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 6 Apr 2012 06:42:07 +0000 (06:42 +0000)

Trivial merge