Merge branch 'maint'
commitcb23085ac23cc0fce1d08361768ea717689f06c1
authorBastien Guerry <bzg@altern.org>
Wed, 16 May 2012 17:08:48 +0000 (16 19:08 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 16 May 2012 17:08:48 +0000 (16 19:08 +0200)
tree1e07c7def0b823d7b70f4d257e9ccd4a02517614
parentd34c0b3496461fa537188b10628091eaa6408b58
parente6560f2528dcf0d77a682b0dab755952205e406d
Merge branch 'maint'
doc/org.texi