Merge branch 'master' of orgmode.org:org-mode
commit5e8abde99387544de89be3f14327c9a1db80dab4
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 28 Sep 2013 17:55:15 +0000 (28 19:55 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 28 Sep 2013 17:55:15 +0000 (28 19:55 +0200)
tree24ec6c38e1aed667caa5c273be837298de832f4a
parent95ca17550e444fd827b031b233fd3ddb8b68e4b9
parent6857d139e1b5ea5c235e3555dbe15aeab227aaef
Merge branch 'master' of orgmode.org:org-mode