Merge "Added a --type filter to showJobs.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 Oct 2014 21:41:55 +0000 (21:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 8 Oct 2014 21:41:55 +0000 (21:41 +0000)

Trivial merge