Merge branch 'hotfix'
commit4899b814831713655ca8c1b60f6355dd1869d972
authorBastien Guerry <bzg@altern.org>
Thu, 5 Apr 2012 06:51:51 +0000 (5 08:51 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 5 Apr 2012 06:51:51 +0000 (5 08:51 +0200)
treea42338149acc452fdc91f89a40ff431ad33b84b9
parent05498b23abcbe0a486bdf4cb890a5ec9a9248d17
parent4e35c21c09f2339f8d95389894ef887aee8539bd
Merge branch 'hotfix'
doc/org.texi