]> source.dussan.org Git - gitignore.git/commit
Merge remote-tracking branch 'arsenm/patch-1'
authorJustin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Fri, 3 Aug 2012 02:03:14 +0000 (19:03 -0700)
committerJustin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Fri, 3 Aug 2012 02:03:14 +0000 (19:03 -0700)
commitfae236e74a38728b00d2df54d99b706316811e83
tree4dbcdf700bbd2eda55d0ee6293ee6946c5c9b5da
parent8486f2204990f48c156408b0965142813b885043
parent1bd40f51eee156e0883358ad5bfde4900b095e74
Merge remote-tracking branch 'arsenm/patch-1'

Conflicts:
C.gitignore