Merge branch 'maint'
commitaf49713a95f4b8f89794106e6d351bd5e7c0e2c2
authorBastien Guerry <bzg@altern.org>
Thu, 24 Jan 2013 11:27:59 +0000 (24 12:27 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 24 Jan 2013 11:27:59 +0000 (24 12:27 +0100)
tree14c4d01c7dac8e1a5e774e3c1ece7e2d328aa114
parent699bb5415b8bafe230d0c89eba8d2032a3434b57
parentd11c9acc664e3c8a30117b6107fceded33f0218a
Merge branch 'maint'
doc/org.texi