Merge branch 'master' of orgmode.org:org-mode
commitf79679077906b6f4e9f1ea1b26a7caab1007e80d
authorBastien Guerry <bzg@altern.org>
Fri, 21 Oct 2011 15:57:40 +0000 (21 17:57 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 21 Oct 2011 15:57:40 +0000 (21 17:57 +0200)
treeaebd979c451fb1d10d0aeccd14fcc836cb22d0da
parent5091facd7f4ec80cce86049d6d84a164cb017970
parenta1ebd4e2071da5edf3ba728acf908c98392ea29f
Merge branch 'master' of orgmode.org:org-mode