Merge "Regression test for detecting edit conflicts."
authorAnomie <bjorsch@wikimedia.org>
Fri, 16 Nov 2012 16:56:34 +0000 (16:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 16 Nov 2012 16:56:34 +0000 (16:56 +0000)

Trivial merge