Merge "Unbreak wfResetOutputBuffers"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 Sep 2015 00:03:45 +0000 (00:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 Sep 2015 00:03:45 +0000 (00:03 +0000)
1  2 
includes/GlobalFunctions.php

Simple merge