Merge branch 'maint'
commit9d045aa16954e98a4aa56e855d17bf9256fbb2e0
authorBastien Guerry <bzg@altern.org>
Sun, 15 Jan 2012 09:31:01 +0000 (15 10:31 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 15 Jan 2012 09:31:01 +0000 (15 10:31 +0100)
tree24499b9fb1821700b6d3129fdd2d77c3b14a305a
parente9ed31f8b9f0561e17341fe6613aebc542f42797
parentaa321a3ed5a630cba1072e90f897f3d9873063cb
Merge branch 'maint'
doc/org.texi