Merge branch 'master' of orgmode.org:org-mode
commit1d606c03e1db3d6e23e5775d74c58dcfcf2b6a64
authorBastien Guerry <bzg@altern.org>
Sat, 29 Jun 2013 05:39:50 +0000 (29 07:39 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Jun 2013 05:39:50 +0000 (29 07:39 +0200)
treecd50bf2759fb1552045d687d21aa33f8b8586f0f
parent5a36318511f5696c03b21cba0992b05c1e6d97dd
parent91a4c8fb1a2847cd914e44e5730bd67d3c3dd92a
Merge branch 'master' of orgmode.org:org-mode