Merge branch 'master' of orgmode.org:org-mode
commit14ba7e2ef24b8129281cba38edb5b5ec2d75bc28
authorBastien Guerry <bzg@altern.org>
Thu, 11 Apr 2013 20:24:17 +0000 (11 22:24 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 11 Apr 2013 20:24:17 +0000 (11 22:24 +0200)
tree28fceb51c2e67dc1fe89a468ab9b498e6e4a2f35
parent9c42cd37dca1e000ff158d08cde877b25cfe56b2
parent7b71f6f49b83d87e239c65f3fa59466614795ddf
Merge branch 'master' of orgmode.org:org-mode