Merge "(bug 37334) ForeignAPIFile::getDescription() should match parent"
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 6 Jun 2012 17:01:14 +0000 (17:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Jun 2012 17:01:14 +0000 (17:01 +0000)

Trivial merge