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)
commitda3f101a77f60d90753ffedcb049c85e54bb0813
treeca4d91cb86fd596e6469fd251119c6ef135903d6
parent0d3647c395b162d9dfd9300b1ae0616f9c8cc94b
parentfe613de8e1b72b8225e81556511ac22ea1e2201d
Merge branch 'develop' into hotfix-0.1alpha2.5