Merge master into linter.

This commit is contained in:
Dave Halter
2015-12-15 12:28:38 +01:00
11 changed files with 144 additions and 19 deletions
+1
View File
@@ -34,5 +34,6 @@ Phillip Berndt (@phillipberndt) <phillip.berndt@gmail.com>
Ian Lee (@IanLee1521) <IanLee1521@gmail.com>
Farkhad Khatamov (@hatamov) <comsgn@gmail.com>
Kevin Kelley (@kelleyk) <kelleyk@kelleyk.net>
Sid Shanker (@squidarth) <sid.p.shanker@gmail.com>
Note: (@user) means a github user name.