Merge branch 'master' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 18 Dec 2012 00:51:30 +0000 (08:51 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 18 Dec 2012 00:51:30 +0000 (08:51 +0800)
commita0363e9b484e011b0aed0b3d3f016818a79c2781
tree1de97bf60c59a28efae10279d79c475a5ced7e3a
parentfba6b590f2f9068bb376a21597df40ef8ac26305
parentb471d52e613102ad7a1cd011f2ab9193c02edb85
Merge branch 'master' into develop