Merge pull request #397 from vtjnash/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 28 Jun 2014 12:38:48 +0000 (20:38 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 28 Jun 2014 12:38:48 +0000 (20:38 +0800)
fix #394


Trivial merge