Merge branch 'develop' v0.2.12
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 13 Oct 2014 09:10:41 +0000 (17:10 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 13 Oct 2014 09:10:41 +0000 (17:10 +0800)
commit7e4e195e82b4940173c4b726864b3594d90c5a3a
tree02884452ceef3be759dded2558efc54e7066bfc0
parenta7126c2ce4d89c442dae602e4bcd57cb3638f100
parentac5a7e1c1bb75d1accfb83c394e1535b5ff170d2
Merge branch 'develop'