Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitd585521b55cbec4594ab01a4d46ccaac92017a94
authorEric Schulte <schulte.eric@gmail.com>
Thu, 8 Jul 2010 17:29:54 +0000 (8 10:29 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Thu, 8 Jul 2010 17:29:54 +0000 (8 10:29 -0700)
tree22ab54a64fe70b4dd13b9803a5bdcb92479b03fa
parent815b7244861690694f287384e254c71c3c514942
parentfb292711439e7f07967d439a45ef19d9467edf69
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode