Merge branch 'master' of http://git.roojs.com/roojs1
authorAlan Knowles <alan@roojs.com>
Tue, 3 Jun 2014 10:30:31 +0000 (18:30 +0800)
committerAlan Knowles <alan@roojs.com>
Tue, 3 Jun 2014 10:30:31 +0000 (18:30 +0800)

Trivial merge