Merge "API: Allow generators to return data"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 26 Nov 2014 18:17:18 +0000 (18:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 26 Nov 2014 18:17:18 +0000 (18:17 +0000)

Trivial merge