Merge branch 'develop' v0.2.11
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 18 Aug 2014 03:16:14 +0000 (11:16 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 18 Aug 2014 03:16:14 +0000 (11:16 +0800)
commita7126c2ce4d89c442dae602e4bcd57cb3638f100
tree5bff29ae963510eaf207996a89c2159ffd9bc14c
parentf20c0f9819961ae4d6dc046d1f0b044e897e4631
parenta69dd3fbc5c38f7098d1539a69963c0d2bd3163a
Merge branch 'develop'