Merge "Document parser cache key control."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 8 Feb 2014 19:40:57 +0000 (19:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 8 Feb 2014 19:40:57 +0000 (19:40 +0000)
1  2 
includes/parser/ParserCache.php
includes/parser/ParserOutput.php

Simple merge
Simple merge