Merge commit 'origin/master' into pub/faces
commited5038e515b9ffb10dde0da5ff196c3350c4451e
authorintrigeri <intrigeri@boum.org>
Fri, 24 Oct 2008 19:37:23 +0000 (24 21:37 +0200)
committerintrigeri <intrigeri@boum.org>
Fri, 24 Oct 2008 19:37:23 +0000 (24 21:37 +0200)
treeb38216f3986aa937d8bfc62ec2a00154f5c2926e
parent3285eb3fc048fecb289b9f937f9b8ca4b47f4f1a
parent264e9c98fd9846f5156179fc4b5bcfdeb937be89
Merge commit 'origin/master' into pub/faces

Conflicts:

markdown-mode.el

Signed-off-by: intrigeri <intrigeri@boum.org>
markdown-mode.el