Merge branch 'develop' v0.2.10
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 17 Jul 2014 07:15:57 +0000 (15:15 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 17 Jul 2014 07:15:57 +0000 (15:15 +0800)
commitf20c0f9819961ae4d6dc046d1f0b044e897e4631
tree8b24f0c1fa8127a42d665b1698acb9f0d4ba5d04
parent21b5347fbe81622bd4569dd7e3f4f69deead1b25
parent134fa320e66b4bfd256b34fc7ca3d3c499d50cfd
Merge branch 'develop'