Merge branch 'develop' v0.2.1
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sat, 30 Jun 2012 00:26:10 +0000 (08:26 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sat, 30 Jun 2012 00:26:10 +0000 (08:26 +0800)
commit551f478477b72a98f8a4767ef7ebb34b5be1bf8e
tree40170078b3b9f99afec2d8f4a1357d4e33355f42
parent47860cf00224162fd73e13f529b4a3dcef702f25
parenta4308807298c650118f86e5cb8126aea6d41f863
Merge branch 'develop'