Merge branch 'master' of orgmode.org:org-mode
commit3cdd81e820f46f9b669ff3f3d5a5b2f2a878fdb4
authorEric Schulte <schulte.eric@gmail.com>
Sun, 7 Apr 2013 13:26:40 +0000 (7 07:26 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Sun, 7 Apr 2013 13:26:40 +0000 (7 07:26 -0600)
treeed0d9569610bcf79989f4d9d9fe7bcdbec368103
parent58d601979c460fbc2078c570b6942d9e96b926cb
parentbd61cb2bf0ec41bb5919fdc8c02b44682363e222
Merge branch 'master' of orgmode.org:org-mode