Merge branch 'hotfix-readme_about_branches'
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 12 May 2011 11:06:02 +0000 (19:06 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 12 May 2011 11:06:02 +0000 (19:06 +0800)
commit8cc628a9536fbbde86832292cfe2906e2eda06da
treead58ec4038256edb1956a0ad64229f5a14bea90d
parent7dcf4eeee7df1d67a17bbeb9abdd1cb9a49b1f6a
parentbbc517292ae6cd15509a65ffc4fbe75c3225fa0f
Merge branch 'hotfix-readme_about_branches'