Merge branch 'hotfix-7.8.06'
commitd0ae7ab479bf2f09ca45295fce9a1a998e18b4fe
authorBastien Guerry <bzg@altern.org>
Tue, 27 Mar 2012 23:04:43 +0000 (28 01:04 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 27 Mar 2012 23:04:43 +0000 (28 01:04 +0200)
tree3ba560274ec21e2cb14e70974db3e4d3370eddc7
parent7686a81c140ac3266664d3ec3a66df616f523a56
parent165cb4610abf846cee4ba3a402c5ba779506c5bf
Merge branch 'hotfix-7.8.06'
lisp/org-beamer.el
lisp/org.el