Merge pull request #404 from wernsaar/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 6 Jul 2014 16:39:33 +0000 (00:39 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 6 Jul 2014 16:39:33 +0000 (00:39 +0800)
A lot of fixes for v0.2.10-rc2


Trivial merge