Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 18 May 2013 16:26:56 +0000 (18:26 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 18 May 2013 16:26:56 +0000 (18:26 +0200)
commit63531fb2cc71993fb262970ee19ffea26a4f7ad4
treebb8c5b0f0bbe7a7895cb8aa5d364d25467897a77
parent0194fd0cdc5969519b3fbfff1b910bee2a39db30
parentc22f5f632bc11e584d9df99efbbe37dfbf50d9af
Merge branch 'maint'
lisp/ox.el