Merge branch 'develop' v0.2.9
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Jun 2014 13:55:47 +0000 (21:55 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Jun 2014 13:55:47 +0000 (21:55 +0800)
commitf773f492f3eec6613a33f4c0dd4721354e1ec88b
treefe28a792fc77934deec7faa52fa0b0db4fc0013f
parent3e068e78e2043c01457848406118c385d1ddb3d4
parent21a6b5f79e7f4d5ba1fac0b851bc46a0df53e042
Merge branch 'develop'