Merge branch 'master' of orgmode.org:org-mode
commita646a2422990fa37d6fd27697fcc6fc7c969792f
authorBastien Guerry <bzg@altern.org>
Fri, 8 Mar 2013 11:23:15 +0000 (8 12:23 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 8 Mar 2013 11:23:15 +0000 (8 12:23 +0100)
tree35250f864db2393fbc681150a8fa0855c030c2c7
parent32385e9536db46becd68a3fea1ad52a76f141e65
parent142ca75957070bc1a35a5b28698e65dd366b0373
Merge branch 'master' of orgmode.org:org-mode