Merge "ignore /.deploy used by git-deploy"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 Jan 2013 15:22:50 +0000 (15:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 Jan 2013 15:22:50 +0000 (15:22 +0000)

Trivial merge