Merge branch 'maint'
commit115680e50dd7f09adafc5254ee5c7bb86bf12162
authorBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 09:15:27 +0000 (7 10:15 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 09:15:27 +0000 (7 10:15 +0100)
tree93a09ce388286ac537561b116be80df21c99c237
parenteb79f0e35d2deec16844bc39622a1b42938b2f8f
parentbeeebfb9a6a968306238a5783e0d2f9b5bf09f5d
Merge branch 'maint'
doc/org.texi