Merge branch 'master' of http://git.roojs.com/roojs1
authorMicheal <micheal@roojs.com>
Tue, 2 Dec 2014 09:36:49 +0000 (17:36 +0800)
committerMicheal <micheal@roojs.com>
Tue, 2 Dec 2014 09:36:49 +0000 (17:36 +0800)

Trivial merge