Merge branch 'develop' v0.2.10.rc1
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 29 Jun 2014 02:46:22 +0000 (10:46 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 29 Jun 2014 02:46:22 +0000 (10:46 +0800)
commitda3d70420ae5a1795fda107d89efdaed5834ff94
treed8c098b616d813ad44582c247bbe18c8cf515221
parentf773f492f3eec6613a33f4c0dd4721354e1ec88b
parent1127f5a2d7afb83cd30e29431634b7475dc3d372
Merge branch 'develop'