Merge branch 'origin-maint'
commit10f26fb805841e0dfa2404da0e7fb5b011f5b14b
authorEric Schulte <eric.schulte@gmx.com>
Fri, 20 Jan 2012 19:00:31 +0000 (20 12:00 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Fri, 20 Jan 2012 19:00:31 +0000 (20 12:00 -0700)
tree11cff7ee779af69cf601e4f7a529619a4f1dc974
parent5852cf7fbf4dfd6d8465b4752b7566c3f2be475e
parent4f5b6317b54c25adad4a6865bdcb7436d05fba75
Merge branch 'origin-maint'
lisp/ob-exp.el
lisp/ob.el
lisp/org-src.el