Merge branch 'wernsaar-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 29 Jun 2014 02:40:54 +0000 (10:40 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 29 Jun 2014 02:40:54 +0000 (10:40 +0800)

Trivial merge