Merge branch 'hotfix-0.1alpha2.3' v0.1alpha2.3
authortraits <traits.zhang@gmail.com>
Thu, 8 Sep 2011 16:55:04 +0000 (00:55 +0800)
committertraits <traits.zhang@gmail.com>
Thu, 8 Sep 2011 16:55:04 +0000 (00:55 +0800)
commite27b761d7cc88b22647b3c1e9c3814c11a56bf57
treee57bdef31c8e87d5a771221f8af43369a982d46e
parent12d77deeee7892d84a0ce862bee4542469ab587f
parentb1fe26c45a3055b1cdf107330d66521425e05d20
Merge branch 'hotfix-0.1alpha2.3'