Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit5770cdae7914b5805075e4d212776ad76c58b306
authorBastien Guerry <bzg@altern.org>
Fri, 5 Nov 2010 17:07:51 +0000 (5 18:07 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Nov 2010 17:07:51 +0000 (5 18:07 +0100)
tree740c2c72cd0e219ad76ae2b2c57cb515f197ea19
parent63981f18f8201c047a8113061a34178119226688
parent874467d6b6ef1fdc83492ead046f2f5fbeba0d85
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode