Merge branch 'master' of http://git.roojs.com/roojs1
authorAlan Knowles <alan@roojs.com>
Wed, 16 Apr 2014 09:54:59 +0000 (17:54 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 16 Apr 2014 09:54:59 +0000 (17:54 +0800)

Trivial merge