Merge branch 'maint' of orgmode.org:org-mode into maint
commit4eddd17ba752b3ae923fd2e4c76d217dd2b00d54
authorBastien Guerry <bzg@altern.org>
Tue, 2 Jul 2013 07:31:57 +0000 (2 09:31 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Jul 2013 07:31:57 +0000 (2 09:31 +0200)
treecad9da102822ac2966ad8b0bd6b9622276f03ed7
parent13c4d7f6e1d8bd0f40aa17f926dfa04608466924
parent3e584f4c54dc42f3e6f82eeee4a20114199caab0
Merge branch 'maint' of orgmode.org:org-mode into maint