sakaiproject/nakamura — pull request #682 by thecarlhall (2012-03-21 00:27:31+00:00)
Title: Merge 1.2.0 to master

There were few merge conflicts with this and they were very minor. Lots of changes though.