Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sun, 11 Dec 2011 12:53:23 +0000 (13:53 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 11 Dec 2011 12:53:23 +0000 (13:53 +0100)
commitc09b919630afd9b86f435071848f88122f87cc2c
treeaaca5bd8534acf49caebbd372a961c22573d514c
parenta39328cddf0fd4a8061d9aaea391910af9ebbff8
parent4e36b533e06d3efc7209eebdaec73f43b91bb22c
Merge branch 'master' of orgmode.org:org-mode