Merge branch 'master' of orgmode.org:org-mode
commit6dd035c9259369a5553bdca094c7378018a5ecf0
authorBastien Guerry <bzg@altern.org>
Fri, 15 Feb 2013 21:59:29 +0000 (15 22:59 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 15 Feb 2013 21:59:29 +0000 (15 22:59 +0100)
treebf56858eb20e3dd9091db713bec1ad2ebf5a7220
parent7c9663eb4add5f087e9ba8bd1745d2b55889d720
parentdaa1d7d8f88de305813fbf750959373789e95ce1
Merge branch 'master' of orgmode.org:org-mode