From: Michael Stapelberg Date: Sun, 24 Jun 2012 19:22:39 +0000 (+0200) Subject: Merge branch 'gitignore' X-Git-Tag: 4.3~201^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27a5cceb6116b175ef354d56d682cb3700e9c345;p=i3%2Fi3 Merge branch 'gitignore' --- 27a5cceb6116b175ef354d56d682cb3700e9c345