Merge "Sync HISTORY with RELEASE-NOTES from REL1_18"
authorBrion VIBBER <brion@wikimedia.org>
Mon, 26 Mar 2012 22:09:20 +0000 (22:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Mar 2012 22:09:20 +0000 (22:09 +0000)

Trivial merge