Merge branch 'maint'
commit1e402cee8b0f18cd27bba86f3ffcd094d94ec78f
authorBastien Guerry <bzg@altern.org>
Wed, 12 Mar 2014 09:47:01 +0000 (12 10:47 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 12 Mar 2014 09:47:01 +0000 (12 10:47 +0100)
tree3ac4ddb227b640c8998eb84e1e7b580873d0ad1d
parent2f60dfc1b357cc78b2cb1c94272d2ab90ffcead3
parent3e560f053c9882678de82f5b69ebe4974f9c4806
Merge branch 'maint'
doc/org.texi