From: Edward <edward@roojs.com>
Date: Fri, 16 May 2014 04:59:36 +0000 (+0800)
Subject: Merge branch 'master' of http://git.roojs.com:8081/roojs1
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=03786de6ca464563182090e1f4368cb52902a29b

Merge branch 'master' of git.roojs.com:8081/roojs1
---

03786de6ca464563182090e1f4368cb52902a29b