Merge branch 'master' of orgmode.org:org-mode
commitad5085517f676f4594560d3ad340a0f10116b046
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 22:27:16 +0000 (27 23:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 22:27:16 +0000 (27 23:27 +0100)
treee278d8abe94b9a46dda2744139a595ef4c3033e4
parentfcd2ca5026ed211850879c48a8a52e4f5edaaa85
parenta7535ca3537a97fdf3bb397fb3adf32df69058f3
Merge branch 'master' of orgmode.org:org-mode