From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 10 Jan 2013 15:22:50 +0000 (+0000)
Subject: Merge "ignore /.deploy used by git-deploy"
X-Git-Tag: 1.31.0-rc.0~21080
X-Git-Url: http://git.cyclocoop.org//%27http:/ie7-js.googlecode.com/svn/test/index.html/%27?a=commitdiff_plain;h=e201cde0d9207e00525d97cc20f0857dcff47145;p=lhc%2Fweb%2Fwiklou.git

Merge "ignore /.deploy used by git-deploy"
---

e201cde0d9207e00525d97cc20f0857dcff47145