Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitee035ae12bf13944c9ac293e8ba953403a182df5
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 20 Dec 2010 14:14:12 +0000 (20 15:14 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 20 Dec 2010 14:14:12 +0000 (20 15:14 +0100)
treea32ef1ba2e986c25d36a234bcf2bb66f667b7e0b
parentaf33cb709a82981ba64cbb68afb756e10e21a506
parentd737c32130163c7c4e82a3b4497856fda8e0162c
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode