]> source.dussan.org Git - gitignore.git/commitdiff
Merge remote-tracking branch 'upstream/master' 456/head
authorJens Jahnke <jan0sch@gmx.net>
Wed, 19 Dec 2012 13:02:28 +0000 (14:02 +0100)
committerJens Jahnke <jan0sch@gmx.net>
Wed, 19 Dec 2012 13:02:28 +0000 (14:02 +0100)

Trivial merge