Merge branch 'master' of ssh://repo.or.cz/srv/git/org-mode
commitfc70272de99d5e50623a3d26cd8881b209a96d8e
authorDan Davison <dandavison7@gmail.com>
Tue, 21 Dec 2010 11:06:24 +0000 (21 11:06 +0000)
committerDan Davison <dandavison7@gmail.com>
Tue, 21 Dec 2010 11:06:24 +0000 (21 11:06 +0000)
treed4e079bcc7eff78ad5269c28302e2753b6d8d285
parent607efd4e30f3c55d471a07847b7d68986852406b
parentd30d00023ac89c3268d9d3f768eb08151e5e8962
Merge branch 'master' of ssh://repo.or.cz/srv/git/org-mode