Merge branch 'master' of http://git.roojs.com:8081/roojs1
authorEdward <edward@roojs.com>
Wed, 9 Apr 2014 09:25:07 +0000 (17:25 +0800)
committerEdward <edward@roojs.com>
Wed, 9 Apr 2014 09:25:07 +0000 (17:25 +0800)

Trivial merge