Merge branch 'master' of orgmode.org:org-mode
commit2201d838a404d614a048ab6e267fafd008d62442
authorBastien Guerry <bzg@altern.org>
Thu, 2 Aug 2012 09:59:34 +0000 (2 11:59 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 2 Aug 2012 09:59:34 +0000 (2 11:59 +0200)
treed5579a2e8ca927890d3c4d4a4e79f3650027886c
parentaa490ffa04f21a03ec4e52a586500b41a0e90d33
parent198b079a647094bdea25ff167c17fcd0e1c07847
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el