Merge branch 'hotfix-0.1alpha2.4' into develop
authorXianyi <xianyi@iscas.ac.cn>
Sun, 18 Sep 2011 09:00:29 +0000 (17:00 +0800)
committerXianyi <xianyi@iscas.ac.cn>
Sun, 18 Sep 2011 09:00:29 +0000 (17:00 +0800)
commit8de2ba67dd071130047980629080443544a03849
tree1ea423ee62ee38a9136471c9f4ebc050909cf0f8
parent7b410b7f0e94edde2a606593086694ae6bb17be8
parent1d31c79dc938183203be5e16cc6851a0bfa1a5e6
Merge branch 'hotfix-0.1alpha2.4' into develop