rSmart/nakamura — pull request #21 by johne (2012-02-09 22:00:35+00:00)
Title: ACAD-145

fixed some merge isses and case insensitive email addresses