Merge branch 'master' of http://git.roojs.com/roojs1
authorAlan Knowles <alan@roojs.com>
Thu, 25 Sep 2014 04:49:34 +0000 (12:49 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 25 Sep 2014 04:49:34 +0000 (12:49 +0800)

Trivial merge