Merge branch 'local-Makefile' into test-makefile-merge
commit08bd0b8892644c3bd10e8f081dc765ada53b8bf9
authorBastien Guerry <bzg@altern.org>
Sat, 21 Apr 2012 08:02:28 +0000 (21 10:02 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 21 Apr 2012 08:02:28 +0000 (21 10:02 +0200)
treebcf00be7c52ba819c2cece3841527482be1daaaf
parent501b76ad365f85750490abc05b20446fba4d409a
parente102e411e4c9a70823b10b25e748f9c1e829b956
Merge branch 'local-Makefile' into test-makefile-merge
doc/org.texi
lisp/org.el