Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitc0c2f3896b079b4bfa846f8193f4ef5a2176f0ca
authorBastien Guerry <bzg@altern.org>
Wed, 27 Oct 2010 17:56:31 +0000 (27 19:56 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Oct 2010 17:56:31 +0000 (27 19:56 +0200)
tree0b0a1cb4788384e81b7336619cf26703328d3e53
parent132131b57b72431c9ba988c86782bdf9228c289f
parent87edef3f87758ba4d5b7d8bae0f305c3d2a8f898
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode