Merge branch 'develop' v0.2.6
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 2 Mar 2013 06:42:06 +0000 (14:42 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 2 Mar 2013 06:42:06 +0000 (14:42 +0800)

Trivial merge