Merge branch 'master' of orgmode.org:org-mode
commitef3d83d0cfe64b076a14344a02aa21cf12523a47
authorBastien Guerry <bzg@altern.org>
Tue, 13 Dec 2011 00:32:17 +0000 (13 01:32 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 13 Dec 2011 00:32:17 +0000 (13 01:32 +0100)
tree7c7f317db42bc833d6663f2d8071cf72fe4dbc34
parent9351ad31e55f21a39a60f409795ccc089cb101fa
parentb21da5f5d6cb0f3e888ff018a3b2507c8ef2a3b8
Merge branch 'master' of orgmode.org:org-mode