Merge branch 'master' of orgmode.org:org-mode
commit59ad74f04779fa3f410d37641982d639533ace52
authorEric Schulte <schulte.eric@gmail.com>
Wed, 16 Mar 2011 13:45:51 +0000 (16 07:45 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Wed, 16 Mar 2011 13:45:51 +0000 (16 07:45 -0600)
tree61249685e0bd0036c60b587955eb39af57182970
parent814012ca80decb126731f18013c9f92e721c06df
parent87c427981f6243ef80efaaa5841211cf17ea0943
Merge branch 'master' of orgmode.org:org-mode