Merge "Added merge() function to BagOStuff for CAS-like functionality."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 Jan 2013 09:50:09 +0000 (09:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 Jan 2013 09:50:09 +0000 (09:50 +0000)

Trivial merge