Merge remote-tracking branch 'origin/master'
[idea/community.git] / .gitattributes
2011-10-12 nikMerge /home/nik/work/jpsImport/JPS
2009-09-28 unknownAdded .gitattributes with crlf flag for module and...