Merge branch 'maint'
commit5217d18a7afa6e7fe27ce3f73d4c92b1f45426df
authorBastien Guerry <bzg@altern.org>
Sat, 5 Jan 2013 17:39:48 +0000 (5 18:39 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 5 Jan 2013 17:39:48 +0000 (5 18:39 +0100)
tree501a78fc702a9f1b10535862e353165b26231e43
parent8d7990acfa00af585d7957a00b2327da9b707411
parent7fe67bb942869d3657f2905202dc4170b14662fd
Merge branch 'maint'
doc/org.texi