Merge branch 'master' of orgmode.org:org-mode
commit9652e5f64ede0167c4bbd2b6a22c2ca6706a087d
authorEric Schulte <schulte.eric@gmail.com>
Tue, 1 Mar 2011 17:42:59 +0000 (1 10:42 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Tue, 1 Mar 2011 17:42:59 +0000 (1 10:42 -0700)
tree74b2e4395870dfdf8a6813abd62167b699188d63
parentcfb06bc70b1c886e9cf12bcd5dac6fadc89f4066
parent87b73ad2711b72cd36327058f47e501c1e525083
Merge branch 'master' of orgmode.org:org-mode