Merge "Revert "(Bug 41436) Tone down sanity check, just warn, don't die.""
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 1 Nov 2012 05:04:24 +0000 (05:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 1 Nov 2012 05:04:24 +0000 (05:04 +0000)

Trivial merge