Merge branch 'master' of orgmode.org:org-mode
commite29a4703c7ee864482006f37f5f32a13d5d58d3d
authorBastien Guerry <bzg@altern.org>
Wed, 10 Jul 2013 10:11:32 +0000 (10 12:11 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 10 Jul 2013 10:11:32 +0000 (10 12:11 +0200)
tree69ced4e629fb7088a48e7ac31bd3750c0965bfab
parent642bd253d0ef768e42667071c2da8cc6dc7691b6
parent325e40d378d83e4dba8e6973d264bc2e70a060ff
Merge branch 'master' of orgmode.org:org-mode