Merge "Partial revert of 2fabea7eea556aba6eda9b3385d9844123328482"
authorReedy <reedy@wikimedia.org>
Mon, 20 Aug 2012 22:08:45 +0000 (22:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 20 Aug 2012 22:08:45 +0000 (22:08 +0000)
commit8f8402ccbbbbec84cd3c261b525db7125cd7ae76
treea79c7b36f002ad6e85e0fe8b386e1faac5fe6469
parent9a187965c2b51437423bf867e58e7b49c21b30a1
parenta45a0d29cc12e8813186049517b81ac7c556775f
Merge "Partial revert of 2fabea7eea556aba6eda9b3385d9844123328482"