Merge branch 'hotfix'
commit00f59ff30bde622c3ab5c8c2b3f9e5249fd89dbe
authorBastien Guerry <bzg@altern.org>
Mon, 9 Apr 2012 10:35:15 +0000 (9 12:35 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 9 Apr 2012 10:35:15 +0000 (9 12:35 +0200)
tree045564114e9fd9e368ea6d7b97f76ac12fa30376
parentf188721692c504fe230dd8082cb9a652e75e29a7
parent2d8913f1fc3b183261972b85620d2962714b9c10
Merge branch 'hotfix'
doc/org.texi