Merge branch 'maint'
commite4a013fcf30717c2fc206aab0fbe59db34cc8c96
authorBastien Guerry <bzg@altern.org>
Sun, 5 Jan 2014 13:21:51 +0000 (5 14:21 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 5 Jan 2014 13:21:51 +0000 (5 14:21 +0100)
tree2a36efc48dd1ea70087a95124ab76c8c96ee0765
parent1792643794ba9046bae267f06dc37c274b590376
parent66fd521264b09dd4764bcc209daa0c8865ac66f8
Merge branch 'maint'
lisp/org.el