]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'master' into add-common-linux-compile-file-extensions 875/head
authorKristofer Rye <kristofer.rye@gmail.com>
Wed, 27 Nov 2013 03:59:01 +0000 (22:59 -0500)
committerKristofer Rye <kristofer.rye@gmail.com>
Wed, 27 Nov 2013 03:59:01 +0000 (22:59 -0500)

Trivial merge