Merge branch 'master' of orgmode.org:org-mode
commitd22ffc23d0134d5712dfee92e81d06d51e7d87a0
authorBastien Guerry <bzg@altern.org>
Tue, 20 Mar 2012 15:29:31 +0000 (20 16:29 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 20 Mar 2012 15:29:31 +0000 (20 16:29 +0100)
tree850105a5a56e0589ab2aaf13ebcd77c8fe08e769
parentc6442dac9c5e4a1eead68a41a5b6dbbe89a80ee2
parentb137bc4eae9b313cf053e11a7ced3aa204e5bb42
Merge branch 'master' of orgmode.org:org-mode