merge master to dev

This commit is contained in:
David Halter
2013-12-23 20:47:20 +01:00
4 changed files with 23 additions and 13 deletions
+3
View File
@@ -36,6 +36,9 @@ Sheng Yun (@ShengYun) <uewing@gmail.com>
Yann Thomas-Gérard (@inside) <inside@gmail.com>
Colin Su (@littleq0903) <littleq0903@gmail.com>
Arthur Jaron (@eyetracker)
Justin M. Keyes (@justinmk)
nagev (@np1)
Chris Lasher (@gotgenes) <chris.lasher@gmail.com>
@something are github user names.