Merge branch 'master' of orgmode.org:org-mode
commit9ae225f48aee2dafa8a053a752a188d40d678213
authorBastien Guerry <bzg@altern.org>
Mon, 25 Mar 2013 11:17:25 +0000 (25 12:17 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Mar 2013 11:17:25 +0000 (25 12:17 +0100)
tree6fa43248924b1e741877948053c701b28d74ab19
parent44b218d2d7ae00529d947372652eb2da60430d5b
parentacff82f9fe1be5b2db9913b7262f9eab65902d3a
Merge branch 'master' of orgmode.org:org-mode