Merge branch 'master' of orgmode.org:org-mode
commit181abcaf2923170a8c6d65842ba9f0fef308a111
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 25 Mar 2013 14:49:35 +0000 (25 15:49 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 25 Mar 2013 14:49:35 +0000 (25 15:49 +0100)
treee60c7db1e6f611e5e91bf8414fddac9e92a26333
parent21fead7888c3842c2fc80d6feb8eb09c475450e5
parent727a22e3270d2ecef5209d22bc1b7ca107e57a2e
Merge branch 'master' of orgmode.org:org-mode