Merge branch 'master' of http://git.roojs.com:8081/roojs1
authorEdward <edward@roojs.com>
Thu, 15 May 2014 10:45:45 +0000 (18:45 +0800)
committerEdward <edward@roojs.com>
Thu, 15 May 2014 10:45:45 +0000 (18:45 +0800)

Trivial merge