Merge branch 'maint'
commit878d6c35e31f1a960db6881e340506410db63919
authorBastien Guerry <bzg@altern.org>
Sat, 6 Jul 2013 14:15:36 +0000 (6 16:15 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 6 Jul 2013 14:15:36 +0000 (6 16:15 +0200)
tree366ad5caf5fdb8534dc5fdd0b00287c0779e913a
parent0bab94dedf0bd883d2fc0fe063e52ba9f9ad31ae
parent42691788273cecb75ec620d40cc5394d2cd95ed1
Merge branch 'maint'
lisp/org.el