Merge branch 'origin-maint'
commit2395c3eff129c9704ca40116a6c2f6fa6a4d3d68
authorEric Schulte <eric.schulte@gmx.com>
Tue, 24 Jan 2012 07:02:52 +0000 (24 00:02 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Tue, 24 Jan 2012 07:02:52 +0000 (24 00:02 -0700)
tree75f4cf087ee751a9ef8efdad9c2bd03b3f473de5
parentcda38d182a4e33d4f377f7df09f39c8f35d31d3d
parenta706f424033fde4b334cfbd2185812bf5324a7d8
Merge branch 'origin-maint'
doc/org.texi
lisp/ob.el
testing/examples/babel.org
testing/lisp/test-ob.el