Merge branch 'maint'
commitd3eaa6abb6ebbcb9d3a7504cab689c1022655409
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 25 May 2013 12:37:01 +0000 (25 14:37 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 25 May 2013 12:37:01 +0000 (25 14:37 +0200)
treeb1a69f767a2e7d37f460d242f5217b610f865b31
parent61d8ebd47273c48fd0df7fc7416d66b557d212d8
parent87ab99f563606494fa147f2d71b20288f41f1d59
Merge branch 'maint'
lisp/ox.el