Merge branch 'master' of orgmode.org:org-mode
commitb019cab9dec2e00742a713c4158da59a02682144
authorBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 20:57:33 +0000 (15 22:57 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 20:57:33 +0000 (15 22:57 +0200)
treeb5be811a108845d2381a63ae3342ca45dd93d1c3
parent4b236f20431fac11a3ef01ab02ba4a867d4527e9
parentdb8d3f5dcfb4056c7920758c8c4fcd43654b27fb
Merge branch 'master' of orgmode.org:org-mode