Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit9a81df13943ad2e7223024b3ed588b9b23d98608
authorBastien Guerry <bzg@altern.org>
Sat, 31 Jul 2010 23:31:46 +0000 (1 01:31 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 31 Jul 2010 23:31:46 +0000 (1 01:31 +0200)
tree4b5c792284509ad2c4f99e3715724d7a3c609e2c
parentcaa5da1efdd79d5984405e6f109eaaca44eac88f
parent9a2ea65bc3e48f2630041619f5d2a3dee77b66d1
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode