Merge branch 'master' of orgmode.org:org-mode
commitffd8dd9f0debb486cb502354e3c3151f927e03a8
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 7 Sep 2013 19:14:42 +0000 (7 21:14 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 7 Sep 2013 19:14:42 +0000 (7 21:14 +0200)
tree28ea76cd8f5dea246dbd39de04ee41cda804daaf
parent0f5f58037dc52b021c6b00cadbda16ba22349be3
parent36d96356361605ec85df530d9c9620b8c06e6a2a
Merge branch 'master' of orgmode.org:org-mode