Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 3 Sep 2014 17:56:47 +0000 (19:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 3 Sep 2014 17:56:47 +0000 (19:56 +0200)
commit9798a5d524d541a3e51fc41ee8c372bab53fa883
tree864a5a180245c69326865d09e3735f4cf1551276
parent38d0eb64b061a2e555c6b0cf877e207e015a17d4
parentdc16617f46d64073e4d06308f7150c46d992a408
Merge branch 'maint'
doc/orgguide.texi