Merge branch 'hotfix-7.8.06'
commit11a47493532ef257ceabef91d3b2eb3adbddd3b9
authorBastien Guerry <bzg@altern.org>
Mon, 2 Apr 2012 21:05:19 +0000 (2 23:05 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 2 Apr 2012 21:05:19 +0000 (2 23:05 +0200)
treeeeb918584c326316f5b46bdfb2a69ad7bbfd3f20
parentc187c512af169e142414f181398209678fd04659
parentbe07df1a4965d639b15466d3243ccab3440f0715
Merge branch 'hotfix-7.8.06'
lisp/org.el