Merge branch 'maint'
commita2b69cc4d77ef2f6372140ae324c9a3ffbe4103e
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 11:38:41 +0000 (17 13:38 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 11:38:41 +0000 (17 13:38 +0200)
treef390a4e5d5f4f13cf98debb09fbcec8db1c78541
parentcd823dc3f76937d9ede7df3cd013d5e982e3746e
parent4315658419ebd22a0b54878029824c3adbe9d510
Merge branch 'maint'
doc/org.texi