Merge branch 'develop' v0.2.7
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 25 Jul 2013 17:34:45 +0000 (01:34 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 25 Jul 2013 17:34:45 +0000 (01:34 +0800)

Trivial merge