Merge branch 'maint'
commitebe0fbd6a8ea763c86784bb3e6a2b14109e9b1d7
authorBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 21:02:25 +0000 (26 22:02 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 21:02:25 +0000 (26 22:02 +0100)
treeee9cfca5498ccb517ad697f887e1a4372ad1863a
parent5bdb84ba74943fed211a355245de5924bacd1bbc
parent2b13d090d124fe6a7a389def71696c3b477bf8f6
Merge branch 'maint'
lisp/org.el