]> source.dussan.org Git - gitignore.git/commitdiff
Merge remote-tracking branch 'upstream/master' 209/head
authorpangratz <pangratz666@gmail.com>
Mon, 12 Dec 2011 13:02:39 +0000 (14:02 +0100)
committerpangratz <pangratz666@gmail.com>
Mon, 12 Dec 2011 13:02:39 +0000 (14:02 +0100)

Trivial merge