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)
commite201cde0d9207e00525d97cc20f0857dcff47145
tree9cb467a97d3bf1118953f88239bbc4811634bd78
parent9f3863c50739ef3e83cb4ee0652b89e82bf0ac42
parentf456ac23502652a3d5526a92c1dc250bc73420b3
Merge "ignore /.deploy used by git-deploy"