Merge branch 'release-0.2.0' into develop
authorZhang Xianyi <xianyi@iscas.ac.cn>
Mon, 25 Jun 2012 23:52:11 +0000 (07:52 +0800)
committerZhang Xianyi <xianyi@iscas.ac.cn>
Mon, 25 Jun 2012 23:52:11 +0000 (07:52 +0800)
commitf430e54daf19746d1c77234375635187a837f06f
tree4aa040524fa6128aa85cf0998983b10d4db60cbd
parent0a958b6a02d22102822c580a4213db4486cda90c
parent13f5f181406df3de4553d2481206df1b19a99b4a
Merge branch 'release-0.2.0' into develop