Merge branch 'platal-0.9.17' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 15 Jun 2008 15:28:01 +0000 (17:28 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 15 Jun 2008 15:28:01 +0000 (17:28 +0200)
commit22801bd99c3622a107c7fa0b4338b1447b169973
treeacd43840029cd6b50ec05ee3874625a527fd9cf6
parentb1719b137280020a1fffee3dc76c68cfaade61ea
parent116e335ab867e35a3bda08aea731cd61410d7e70
Merge branch 'platal-0.9.17' into hruid