Merge changes Ib2cb36cd,I50dec908
authorDemon <chadh@wikimedia.org>
Fri, 27 Apr 2012 18:36:05 +0000 (18:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Apr 2012 18:36:05 +0000 (18:36 +0000)
* changes:
  Adding Maintenance output tests
  fwriting to STDOUT -> print in Maintenance


Trivial merge