Merge branch 'maint'
commit679dce0fda64e566f6a4106ec11aa090cdbc28df
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 14:26:17 +0000 (8 15:26 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 14:26:17 +0000 (8 15:26 +0100)
tree7e811741c4cf11e34080faac001ededfc13b435d
parent5fc740a23040559323a6e12a99808df07e85a7b9
parent31c1aeabaeb394ae461e8636572fd91ca27313bb
Merge branch 'maint'
doc/org.texi
lisp/ob-io.el
lisp/ob-scala.el
lisp/org-element.el
lisp/org-html.el