Merge branch 'maint'
commit2dbd84ecaa1d2b26a36aeb14b237fc9a7259ce55
authorBastien Guerry <bzg@altern.org>
Fri, 14 Dec 2012 10:48:08 +0000 (14 11:48 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Dec 2012 10:48:08 +0000 (14 11:48 +0100)
tree5dcc743f7867c325c0fa1c049264d542d5d3e3a3
parent6af6e957dfff4e94fd79dc0ec385a18cc4f26c7d
parent6f5b4a8b73e046e2f1b80750048e80ef9c0b2b06
Merge branch 'maint'
doc/orgguide.texi