Merge branch 'ff/ascent'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)
commit3552315a7b95c8d3835464649afbf6bb1ae9da0b
tree1c6dc333a5a55786a6f1b18d77bb1eda7f67e9fe
parent68cf1d4cbc778efaafc30127bff607114a92a825
parent41786d5a77bd0245883b07f9604467cbb5b56606
Merge branch 'ff/ascent'