Merge branch 'master' of orgmode.org:org-mode
commit9a863dda8454aae4b26a7f265ce13dbff294267d
authorEric Schulte <schulte.eric@gmail.com>
Tue, 19 Apr 2011 15:44:32 +0000 (19 09:44 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Tue, 19 Apr 2011 15:44:32 +0000 (19 09:44 -0600)
treeedbbb76835d47555a76780f89cfefd701a6bf567
parent892b66f0625a33b294a793304f1a68983c52711d
parent6f2113b85ce29a2d906f3b1cc95372e3855f03cb
Merge branch 'master' of orgmode.org:org-mode