Merge branch 'maint'
commite6d8ed51b8434046d1e49d4c3f19994d69017780
authorBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 13:01:51 +0000 (24 14:01 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 13:01:51 +0000 (24 14:01 +0100)
tree52badace846cc7d139c9f613be2ad51278e1d1b5
parent4549f0c99cef65c68879641d2a96ad486b64e6b1
parent1b4e396b6b2b015b67784eca7f046e177208c4b3
Merge branch 'maint'
lisp/org-odt.el