Merge remote branch 'origin/master' into merge-candidatestaging
commit576685847210a442171363113ed607fa3b00f714
authorJambunathan K <kjambunathan@gmail.com>
Mon, 13 Jun 2011 05:06:11 +0000 (13 10:36 +0530)
committerJambunathan K <kjambunathan@gmail.com>
Mon, 13 Jun 2011 05:06:11 +0000 (13 10:36 +0530)
tree85a88fbb8415f86367ec3aeb120747bd6ac09e73
parent46f5e67ccc1f7d7ea85f0006225e5ebc70843557
parent6d96446005fa49db072ee34ac33a979b61ec6929
Merge remote branch 'origin/master' into merge-candidate
Makefile
lisp/org-exp.el
lisp/org-footnote.el
lisp/org.el