Merge branch 'master' of http://git.roojs.com:8081/roojs1
authorEdward <edward@roojs.com>
Fri, 16 May 2014 04:48:33 +0000 (12:48 +0800)
committerEdward <edward@roojs.com>
Fri, 16 May 2014 04:48:33 +0000 (12:48 +0800)

Trivial merge