Merge the master branch into the dev branch.

This commit is contained in:
Dave Halter
2015-02-09 14:41:41 +01:00
7 changed files with 18 additions and 9 deletions
+1
View File
@@ -30,5 +30,6 @@ ppalucky (@ppalucky)
immerrr (@immerrr) immerrr@gmail.com
Albertas Agejevas (@alga)
Savor d'Isavano (@KenetJervet) <newelevenken@163.com>
Phillip Berndt (@phillipberndt) <phillip.berndt@gmail.com>
Note: (@user) means a github user name.