Merge branch 'master' of orgmode.org:org-mode
commit3f95d811c231e6b991928ff12baa605706ac8716
authorBastien Guerry <bzg@altern.org>
Sat, 16 Feb 2013 20:33:45 +0000 (16 21:33 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 16 Feb 2013 20:33:45 +0000 (16 21:33 +0100)
treebca24d9485bef6851bd778e775025e25c37820fa
parentc1cdb379af685eecb286172742abdd2631dc7419
parent9a6127d77b665be0e57cdb51f0e712f541e941e4
Merge branch 'master' of orgmode.org:org-mode