Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit6c2584c968c9733f6213fc6eaae220781befa5fd
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 29 Jun 2010 04:25:12 +0000 (29 06:25 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 29 Jun 2010 04:25:12 +0000 (29 06:25 +0200)
tree2fec66fbc592dd55af838e7b51d8857130483017
parent1318128a2445fc35a57ffc89694ff8203a27affc
parentb9548e92ab1377f1cae82d41bde7f0c5ef0a3e88
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode