Merge branch 'master' of orgmode.org:org-mode
commitf6d7230ca25dba3c455469c811f947110ccb6487
authorBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 08:45:03 +0000 (15 10:45 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 08:45:03 +0000 (15 10:45 +0200)
treeedf52505023df7a09faececfed863cbead5ca97d
parentab8689d2617c18862fb12d19c2ccb79b1af224fa
parentdf2807b59dc08b3a71d135b9bdf34a83c48ed381
Merge branch 'master' of orgmode.org:org-mode