Merge branch 'develop' v0.2.2
authorZhang Xianyi <xianyi@iscas.ac.cn>
Fri, 6 Jul 2012 14:09:12 +0000 (22:09 +0800)
committerZhang Xianyi <xianyi@iscas.ac.cn>
Fri, 6 Jul 2012 14:09:12 +0000 (22:09 +0800)
commit71d29fa3d0e47e3b3f17bd15b63ae4dad66e7efa
tree4ae4398b9693c35e675016092a6a45b27be8d164
parent551f478477b72a98f8a4767ef7ebb34b5be1bf8e
parent50848e34ec2b67ff38ee4ddb057ec8884707a469
Merge branch 'develop'