Merge branch 'maint'
commitd52e988c362155d55435323626ea14b24657bdd5
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 14:35:05 +0000 (29 16:35 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 14:35:05 +0000 (29 16:35 +0200)
treec097f6ce6de701849455a61ed2a117d1c3d64a81
parent7d8a0c48a39ee8191580b1dbe5bf7ccad3135f64
parentead43c9807cba47ffb6af075798b5ec17fcc5afc
Merge branch 'maint'
doc/org.texi