Merge branch 'develop' v0.2.3
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 20 Aug 2012 08:52:35 +0000 (16:52 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 20 Aug 2012 08:52:35 +0000 (16:52 +0800)

Trivial merge