Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 6 Nov 2013 18:17:39 +0000 (19:17 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 6 Nov 2013 18:17:39 +0000 (19:17 +0100)
1  2 
lisp/org-element.el

Simple merge