Merge branch 'master' of orgmode.org:org-mode
commitcb973614bd3fb106acf69d4514e09a783bcaf0a2
authorBastien Guerry <bzg@altern.org>
Sun, 24 Jul 2011 18:44:01 +0000 (24 20:44 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 24 Jul 2011 18:44:01 +0000 (24 20:44 +0200)
tree8ebc6860f58e911b374b979d0fd028b48a1e53f5
parent53da4c15a9077c0487fb5ddba4158e40356758fe
parentba092ec08d3a7b3fe3cd1b617a1b6c297382fd4d
Merge branch 'master' of orgmode.org:org-mode