Merge branch 'master' of orgmode.org:org-mode
commitfb920a38ad1ff66d319e61a7c92cf8af072ab77c
authorBastien Guerry <bzg@altern.org>
Thu, 28 Feb 2013 09:21:08 +0000 (28 10:21 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 28 Feb 2013 09:21:08 +0000 (28 10:21 +0100)
treedf627c344d936d93f519c30ac6598478ab22117d
parentf9cc5e72d937715d76f20df305554f20c6529cc4
parent9dba62be72d18154d53987af2916f235ae7b4c14
Merge branch 'master' of orgmode.org:org-mode