Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 11:58:15 +0000 (12:58 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 11:58:15 +0000 (12:58 +0100)
1  2 
lisp/org-element.el

Simple merge