Merge branch 'master' into session

Conflicts:
	lisp/org-babel-R.el
	org-babel.org
This commit is contained in:
Eric Schulte 2009-06-14 15:11:48 -07:00
commit fb995f252c

Diff Content Not Available