Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 12:27:56 +0000 (13:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 12:27:56 +0000 (13:27 +0100)
commit936f13c6299ca6773f9f9d14f6427e322fd0723c
treea705080aef8d694db4630c634ad092697bbbd32e
parent0284bc9d4d9feaf9506dd6e3752c8c699f54afe6
parentaecccc10d06ce28ebcd68c2278b845c427d79e9d
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el