]> source.dussan.org Git - gitignore.git/commitdiff
Merge remote-tracking branch 'remotes/upstream/master' 163/head
authorMichael Bemmerl <mail@mx-server.de>
Sun, 5 Jun 2011 21:48:03 +0000 (23:48 +0200)
committerMichael Bemmerl <mail@mx-server.de>
Sun, 5 Jun 2011 21:48:03 +0000 (23:48 +0200)

Trivial merge