Merge branch 'master' of orgmode.org:org-mode
commit4757c5c8dd74ea2b8e8d569e917675bf632efba9
authorBastien Guerry <bzg@altern.org>
Thu, 18 Apr 2013 08:29:12 +0000 (18 10:29 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 18 Apr 2013 08:29:12 +0000 (18 10:29 +0200)
tree212f89ed09ee4d0aeeac6185f074c33d507bdf07
parent4231cb4b129ece52526d415e0c900c7d16bf4181
parent77c5710de2256dd19a1b05ea8411e787f611a515
Merge branch 'master' of orgmode.org:org-mode