Merge pull request #201 from Explorer09/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 18 Mar 2013 14:31:30 +0000 (07:31 -0700)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 18 Mar 2013 14:31:30 +0000 (07:31 -0700)

Trivial merge