Merge "ObjectFactoryTest: Add tests for 'factory' option"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 17 Aug 2016 22:55:34 +0000 (22:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Aug 2016 22:55:34 +0000 (22:55 +0000)

Trivial merge