Merge pull request #1006 from lynnaloo/master
authorTravis Webb <travis@traviswebb.com>
Sun, 3 Nov 2013 20:30:28 +0000 (12:30 -0800)
committerTravis Webb <travis@traviswebb.com>
Sun, 3 Nov 2013 20:30:28 +0000 (12:30 -0800)
commite49e2b5d04f90aca64057739fe6ae1be17ae123e
tree3a390aad633f3878363e6cf4825946d94b6759fa
parent94000167c87b69559bf068365734192a98b6589a
parent9194b6de567196d4b8a5d5cf9199961ea5be3b39
Merge pull request #1006 from lynnaloo/master

Fixed .gitattributes file