Merge branch 'master' of orgmode.org:org-mode
commit239aa7e7d424802d35ed761c03a23eaf4d64558f
authorBastien Guerry <bzg@altern.org>
Tue, 2 Jul 2013 07:32:15 +0000 (2 09:32 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Jul 2013 07:32:15 +0000 (2 09:32 +0200)
treed07c0847e2bcdd37757dff0839fe8c7267e48868
parent25f4e5f7f7491e295aac96d1f8ae1f4bedfc300c
parentd1079c4f3f325c444fcff3ffa4d2fe8d370b7143
Merge branch 'master' of orgmode.org:org-mode