Merge branch 'master' of orgmode.org:org-mode
commit91a6caa6a26431fbcf5d58aed170fa5a83cd78d3
authorBastien Guerry <bzg@altern.org>
Sat, 16 Mar 2013 21:08:26 +0000 (16 22:08 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 16 Mar 2013 21:08:26 +0000 (16 22:08 +0100)
treecd8a4447f0c0bf1edcd8a1d6e6f3c77f8fcfaf4d
parent0c82deb42152a853a48646097748b7e6e16a444d
parent67a17cfe857a5e3ad58083207c49ce9148f19f97
Merge branch 'master' of orgmode.org:org-mode