From: pangratz <pangratz666@gmail.com>
Date: Mon, 12 Dec 2011 13:02:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94f45ecd5cf53f17d895d9e13b6521911dcf184b;p=gitignore.git

Merge remote-tracking branch 'upstream/master'
---

94f45ecd5cf53f17d895d9e13b6521911dcf184b