Merge branch 'develop' into hotfix-0.1alpha2.5
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 14:31:09 +0000 (22:31 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 14:31:09 +0000 (22:31 +0800)

No differences found