Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 14 Feb 2013 09:40:04 +0000 (10:40 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 14 Feb 2013 09:40:04 +0000 (10:40 +0100)
1  2 
doc/org.texi
lisp/org.el

diff --cc doc/org.texi
Simple merge
diff --cc lisp/org.el
Simple merge