Merge branch 'master' of orgmode.org:org-mode
commit50caf9742231d5b5bba95caa199fca32cdbefe65
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:46:30 +0000 (29 23:46 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:46:30 +0000 (29 23:46 +0200)
tree550ff7ad47edc97e01d9786c2e6967502159db81
parenta5483f2d3972f57ecbe8459fd332f7018e773363
parent86e515d7cc21534747e32e9bc4763bcdb3e787a8
Merge branch 'master' of orgmode.org:org-mode