Merge branch 'master' of orgmode.org:org-mode
commit6202df567c09b5dda09d5496ba1249e4ec819748
authorBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 22:47:39 +0000 (13 23:47 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 22:47:39 +0000 (13 23:47 +0100)
treeeb171e3fec1aa5f157c178580a634010fe35c70f
parent2c164be668dfa5f515bbfafc5249f8f9242fc588
parent286fd7f2500c4e13ab54fb06cd62e0d1a77ecc8a
Merge branch 'master' of orgmode.org:org-mode