Merge branch 'maint'
commita0d4c8d85da9415e2b8fdcb129c884ea8cbcb493
authorBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 12:09:55 +0000 (7 13:09 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 12:09:55 +0000 (7 13:09 +0100)
tree2a7efea7a49c41f578c69d0eefcd2e716d0bb68d
parent115680e50dd7f09adafc5254ee5c7bb86bf12162
parent5b7d53e7132ca9dbb06112c9bb34c97f2e410bcf
Merge branch 'maint'
doc/org.texi