Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Mon, 18 Jul 2011 16:14:58 +0000 (18:14 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 18 Jul 2011 16:14:58 +0000 (18:14 +0200)
commit05c66a2e2f3ef75362586afa5bc1a22fe17dbced
treea390383fbb2326fa33e1d2952ec903b02b717693
parent395af11404f3348c92e9ca234f1cb0fe9bd3529a
parent06bf0eb7fe9fa0446f586d785dd8c9bdd96950ae
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el