Merge branch 'doc'
commit70d42db84c298cf56d19d1346f7ca82b1b9519e5
authorCedric Bastoul <cedric.bastoul@u-psud.fr>
Sun, 12 Jun 2011 08:47:24 +0000 (12 10:47 +0200)
committerCedric Bastoul <cedric.bastoul@u-psud.fr>
Sun, 12 Jun 2011 08:47:24 +0000 (12 10:47 +0200)
tree7e453d783d9993afc8ec22173cb02599f53dece7
parent9a0d5f575aa5654790424af3fe75af17325c891b
parente3bfc0deca39baf1d77e224ca831cfc6c3812c2b
Merge branch 'doc'