Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 16 Jul 2014 10:04:30 +0000 (18:04 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 16 Jul 2014 10:04:30 +0000 (18:04 +0800)

Trivial merge