Merge "includes/ContentHandler.php does not exist, it's includes/content/ContentHandl...
authorReedy <reedy@wikimedia.org>
Sun, 14 Oct 2012 23:26:18 +0000 (23:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 14 Oct 2012 23:26:18 +0000 (23:26 +0000)

Trivial merge