Merge branch 'pr/2007'

Conflicts:
	licenses/cla-individual.md
This commit is contained in:
Jermolene
2015-10-24 19:13:42 +01:00
+2
View File
@@ -254,3 +254,5 @@ Karl Knechtel, @zahlman, 2015/10/03
Tony Grosinger @tgrosinger 2015/10/03
Antaeus Feldspar @afeldspar 2015/10/20
Soeren Enevoldsen, @senevoldsen90, 2015/10/09