Merge branch 'master' of orgmode.org:org-mode
commit5700a0eb2d64649bea9526de86062ea69f317e44
authorBastien Guerry <bzg@altern.org>
Mon, 25 Feb 2013 09:15:49 +0000 (25 10:15 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Feb 2013 09:15:49 +0000 (25 10:15 +0100)
tree02ca29be5592fc0b785fe3df608645cf86d4ded1
parent49772f1f260f89fd9b5d621e5bf06f9126dab1e0
parent8838585a42122490f855aa807355556e2fbc56b6
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el