floralvikings/jenjin — pull request #7 by floralvikings (2013-06-23 01:34:42+00:00)
Title: Develop

Merge develop into master for release 1.1