Merge branch 'master' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 22 Mar 2012 16:00:13 +0000 (00:00 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 22 Mar 2012 16:00:13 +0000 (00:00 +0800)
commitb4ec36debc4b6ad39805840cf24d0f6596a934dd
tree4814de8ef6ff97284c986d5ff28fdc6640b618c6
parent1f15bee02acaff0255566360a36a0fc2e30441c6
parentfda39c6cb0fcc70da2da7f49b1ff9736264b372e
Merge branch 'master' into develop