Merge branch 'TimothyGu-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 19 May 2014 02:37:20 +0000 (10:37 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 19 May 2014 02:37:20 +0000 (10:37 +0800)
commitd2a8ff4b04a03fc13e489931a87829a2403f4093
tree093d7516c5b644a75590603a30146496f2be8ea4
parentc38379c9dd44c0b2ab11ad85aa54b17f073225d0
parentf331cb1a76fded2efbf5aec7fe3a53bb73dc12e9
Merge branch 'TimothyGu-develop' into develop