Merge 'jnr/master'
authorJoshua Roesslein <jroesslein@gmail.com>
Sat, 3 Apr 2010 03:00:51 +0000 (22:00 -0500)
committerJoshua Roesslein <jroesslein@gmail.com>
Sat, 3 Apr 2010 03:01:49 +0000 (22:01 -0500)
1  2 
CONTRIBUTORS

diff --cc CONTRIBUTORS
index 54dff07152f4576a1a765f10d8456daddc295b7d,54dff07152f4576a1a765f10d8456daddc295b7d..7346474b08d860d44c18f06cf829cd1c01786882
@@@ -10,3 -10,3 +10,4 @@@ Bas Westerbaa
  Ivo Wetzel
  Will McCutchen
  Gergely Imreh
++James Rowe