]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'master' of https://github.com/sepehr/gitignore into sepehr-master
authorChris Wanstrath <chris@ozmm.org>
Tue, 22 Feb 2011 02:00:51 +0000 (18:00 -0800)
committerChris Wanstrath <chris@ozmm.org>
Tue, 22 Feb 2011 02:00:51 +0000 (18:00 -0800)

Trivial merge