Merge branch 'maint'
commit2e94271bd1a77f01b98d038aa28568bde175b740
authorBastien Guerry <bzg@altern.org>
Wed, 3 Oct 2012 10:15:35 +0000 (3 12:15 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Oct 2012 10:15:35 +0000 (3 12:15 +0200)
tree41b9dd933c96d2b49930e5e6ecd67bdf27968f2d
parent34681fb135286fb11c0a80fb81a281e866d4152a
parent21478e1733e01cdf3a3f91e8b56f0d3aa3617fd5
Merge branch 'maint'
contrib/lisp/org-e-odt.el