Merge branch 'release-0.2.9' v0.2.9.rc2
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 6 Mar 2014 09:45:31 +0000 (17:45 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 6 Mar 2014 09:45:31 +0000 (17:45 +0800)

Trivial merge