Merge branch 'maint'
commitd542097aa3870dd80d1a1a2700b486f3086bca6e
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 15:56:14 +0000 (12 17:56 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 15:56:14 +0000 (12 17:56 +0200)
treebfcfc0cc6d7679a0560d16f6f431e76cf5fdc395
parenta09d968d30d08d5bc3df7d4c4e7ec9adf8af8bf2
parente7cd6f1875f880effc437ad893d729bcfb9b1da6
Merge branch 'maint'
lisp/ox.el