Merge branch 'master' into develop
authorXianyi Zhang <traits.zhang@gmail.com>
Fri, 20 Jan 2012 13:32:13 +0000 (21:32 +0800)
committerXianyi Zhang <traits.zhang@gmail.com>
Fri, 20 Jan 2012 13:32:13 +0000 (21:32 +0800)
commit142e99d4e97dc9387f417e5e45b92a63895743ed
treea38ec00bd92e8b4e57453bc5c11351e411169129
parentd5a6d789e6dae666743943b2120ff27baf257e08
parent0d3647c395b162d9dfd9300b1ae0616f9c8cc94b
Merge branch 'master' into develop