Merge branch 'hotfix-0.1alpha2.5'
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 14:56:06 +0000 (22:56 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 14:56:06 +0000 (22:56 +0800)
commit0caa5616f27bac9a246715c9166163fb29e2b8a5
tree78e6a081063fc6598d91530b71862574fa03c9c8
parent0d3647c395b162d9dfd9300b1ae0616f9c8cc94b
parent727e6d83c05d0fba4f8fd9a04f84cf032eaaca6e
Merge branch 'hotfix-0.1alpha2.5'