Merge branch 'master' of orgmode.org:org-mode
commitacff82f9fe1be5b2db9913b7262f9eab65902d3a
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 25 Mar 2013 10:48:40 +0000 (25 11:48 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 25 Mar 2013 10:48:40 +0000 (25 11:48 +0100)
tree2796cb66bf94262d2a68db88bf51acf2a34d124f
parent10e239f434e63ce5e0b4b242911357536dad98fe
parent78959943e272f9e83a474d9c50b9d5ae0f034952
Merge branch 'master' of orgmode.org:org-mode