Merge branch 'master' of orgmode.org:org-mode
commit68cf793ba9ac4b2987964f033e9f545df0244587
authorBastien Guerry <bzg@altern.org>
Fri, 4 Feb 2011 22:22:40 +0000 (4 23:22 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 4 Feb 2011 22:22:40 +0000 (4 23:22 +0100)
tree54d91f1d716487e42e3dada35ea5bea9a1d5bd15
parent123f3b774c774ce7b6cc7875f7e2ae596deabc37
parent27d98d87939cee187aaebced143dd79fab9439b7
Merge branch 'master' of orgmode.org:org-mode