Merge branch 'maint'
commit2ac57db0a3bece3f00d9a3ad698b6cf94c134c76
authorBastien Guerry <bzg@altern.org>
Mon, 4 Nov 2013 11:20:20 +0000 (4 12:20 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 4 Nov 2013 11:20:20 +0000 (4 12:20 +0100)
tree414577ab9b2c802434c51564774b9f9d01a320d7
parentd586ef111a3dd2608073e3ea558cb4c0db2aefe4
parent56d405a41c3ce0d4c181bdc920e7a8a7647330b2
Merge branch 'maint'
lisp/ob-tangle.el
lisp/org.el