Merge branch 'master' of orgmode.org:org-mode
commit68e1ededffee674bdc6b6a352fa18737e9972cf3
authorBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 18:45:32 +0000 (1 20:45 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 18:45:32 +0000 (1 20:45 +0200)
treee735c2d05e01f8e0e368a38f4a27d2d596605cfc
parent99f7f5def3225a1fdb50204fe517768f58cde8a3
parentf7e6f1589d70c633f1ba2a86afe86414dd1513f6
Merge branch 'master' of orgmode.org:org-mode