Merge branch '2.5' into 2.6

This commit is contained in:
mark_story 2014-05-04 22:14:45 -04:00
commit 4f0845d243

View file

@ -11,3 +11,7 @@ trim_trailing_whitespace = true
[*.bat]
end_of_line = crlf
[*.yml]
indent_style = space
indent_size = 2