Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 2 Mar 2013 06:24:23 +0000 (14:24 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 2 Mar 2013 06:24:23 +0000 (14:24 +0800)
commite5ac3007e07b64b04fe3e73dd24e71581b1d68ed
treef91087edb779068b0c22edb63420eab54229a204
parentb471d52e613102ad7a1cd011f2ab9193c02edb85
parent0d0405b434808d8c8122474a4dcfa089f4962512
Merge branch 'develop'