Merge branch 'maint'
commit4996e5bd8e5fd889784dfa5fa5f011fcd59fb521
authorBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 14:04:43 +0000 (18 15:04 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 14:04:43 +0000 (18 15:04 +0100)
tree52bdce38e6d488075bd3e72e4d304e03de4b596f
parent1af0b39c010a913abec92b51f4a677283ba7ffd2
parent9d4dd69b30a5fabf03728e46c194b64e1a9fd4e8
Merge branch 'maint'
lisp/org.el