Merge branch 'master' of http://git.roojs.com:8081/roojs1
authorEdward <edward@roojs.com>
Thu, 12 Feb 2015 04:10:35 +0000 (12:10 +0800)
committerEdward <edward@roojs.com>
Thu, 12 Feb 2015 04:10:35 +0000 (12:10 +0800)

Trivial merge