merge documentation change of #231 of @tndoan and resolve authors conflict

This commit is contained in:
David Halter
2013-12-23 20:49:51 +01:00
3 changed files with 9 additions and 0 deletions
+1
View File
@@ -39,6 +39,7 @@ Arthur Jaron (@eyetracker)
Justin M. Keyes (@justinmk)
nagev (@np1)
Chris Lasher (@gotgenes) <chris.lasher@gmail.com>
Doan Thanh Nam (@tndoan)
@something are github user names.