Merge branch '1.0-pre12'
[GitHub/Stricted/SpeedportHybridControl.git] / .gitattributes
2015-10-27 Strictedfirst commit