Merge branch 'master' of http://git.roojs.com/roojs1
authorAlan Knowles <alan@roojs.com>
Tue, 9 Jun 2015 05:03:33 +0000 (13:03 +0800)
committerAlan Knowles <alan@roojs.com>
Tue, 9 Jun 2015 05:03:33 +0000 (13:03 +0800)

Trivial merge