Merge branch 'master' of orgmode.org:org-mode
commit4670e954583ca64e67764b44cfe06d7cfe431e72
authorBastien Guerry <bzg@altern.org>
Tue, 19 Jul 2011 16:34:02 +0000 (19 18:34 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 19 Jul 2011 16:34:02 +0000 (19 18:34 +0200)
treeafc95caec939f84f67f2985a570fb21941d5d1e7
parent3482284bbd693cdf6bdd884a923ac0d5cd3636db
parentd883d0b01d872091391f80d0416952b70a743ee7
Merge branch 'master' of orgmode.org:org-mode
doc/org.texi
lisp/org-capture.el