Merge branch 'master' of orgmode.org:org-mode
commite2f95037e4571d17d6ab33107135b72bcd7c9056
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 07:04:46 +0000 (8 08:04 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 07:04:46 +0000 (8 08:04 +0100)
tree6bd7b752e74dde6b1eadf3f8ca1fe14c34326ce9
parentdaa35c0c686d212a1fc7c57fff546f16d3248ab2
parent5328e1cd02cb333069064a363b7a30ec73d90828
Merge branch 'master' of orgmode.org:org-mode