Merge branch 'hotfix-0.1alpha2.5' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 15:11:06 +0000 (23:11 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 15:11:06 +0000 (23:11 +0800)
commit8da6fdc2ceac5677b24cb731313edca11cd42da5
tree78e6a081063fc6598d91530b71862574fa03c9c8
parentfe613de8e1b72b8225e81556511ac22ea1e2201d
parent727e6d83c05d0fba4f8fd9a04f84cf032eaaca6e
Merge branch 'hotfix-0.1alpha2.5' into develop