Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitdfb52eb7a7bbdc3bea10651eae2e45aa898150b1
authorBastien Guerry <bzg@altern.org>
Sun, 7 Nov 2010 13:42:39 +0000 (7 14:42 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 7 Nov 2010 13:42:39 +0000 (7 14:42 +0100)
treee03f72d5b16ae820b65a7f32db18098345c31400
parent5770cdae7914b5805075e4d212776ad76c58b306
parentd96c9980199b88a8ecce58984fa0e6e50f369fc4
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode