Merge branch 'origin-maint'
commit5a2434877834261f63ab1f2ed32acb0aea0be16d
authorEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 17:39:04 +0000 (18 10:39 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Sat, 18 Feb 2012 17:39:04 +0000 (18 10:39 -0700)
tree638ec566b52c5f02d66877f4399ab225ba7a6081
parent5e2d781f5a9340c37163f6d1650e0c92f9480faa
parent19f1bf6bce8602725acb36691af2367d0a10e78e
Merge branch 'origin-maint'
lisp/ob.el
lisp/org-exp.el
lisp/org-src.el
lisp/org.el