Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 20 Jul 2013 15:05:36 +0000 (23:05 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 20 Jul 2013 15:05:36 +0000 (23:05 +0800)

Trivial merge