Merge branch 'master' into issue#16
authorFreeBirdLjj <ljj11011@mail.ustc.edu.cn>
Sun, 28 Sep 2014 11:58:24 +0000 (19:58 +0800)
committerFreeBirdLjj <ljj11011@mail.ustc.edu.cn>
Sun, 28 Sep 2014 11:58:24 +0000 (19:58 +0800)
commitb723e39232abc7632311eb06d7046c214ee05b51
tree46d1d77bcfbae1639fe7d53b7e2c2be37c8b0b0d
parentbc3a373a2926e34352018677bfb5ed2eacede2a8
parentc6516c715699de465423de60089efee1ec5857e1
Merge branch 'master' into issue#16