Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 07:46:36 +0000 (08:46 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 07:46:36 +0000 (08:46 +0100)
1  2 
lisp/org-macs.el

Simple merge