Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

ChangeLog

@@ -1,6 +1,3 @@
-2008-02-07  Phil Jackson  <phil@shellarchive.co.uk>
-
-	* CONTRIB/lisp/org-irc.el: New File.
 
 2008-02-07  Carsten Dominik  <dominik@science.uva.nl>