Merge branch 'develop' v0.2.10.rc2
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 9 Jul 2014 00:48:00 +0000 (08:48 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 9 Jul 2014 00:48:00 +0000 (08:48 +0800)
commitf9991fd5f627569827f73c5be46addfaf8ced6a5
tree6e586d1588cbddbc1465036aa72ef89ba0f480d5
parentda3d70420ae5a1795fda107d89efdaed5834ff94
parent47688e24e99079191488b2fc57248f92753e0611
Merge branch 'develop'