Merge branch 'develop' v0.2.5
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 26 Nov 2012 23:24:53 +0000 (07:24 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 26 Nov 2012 23:24:53 +0000 (07:24 +0800)

Trivial merge