Merge branch 'master' of orgmode.org:org-mode
commit1ebac8923c7fb13427688a93e51ac64720a834ea
authorBastien Guerry <bzg@altern.org>
Tue, 9 Apr 2013 15:13:59 +0000 (9 17:13 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 9 Apr 2013 15:13:59 +0000 (9 17:13 +0200)
tree33f6740a69f39c4e2b8dd19e5af0be19648a36f1
parent3fef0415fb58bdc93938d6a24db6c48ae282e339
parent5f4831556836148c1074929a754cbe6a1cb18b82
Merge branch 'master' of orgmode.org:org-mode