Merge branch 'maint'
commit45a00a4d82d66eee6d309eb16f78fa4bea6d264d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 26 Sep 2014 09:11:34 +0000 (26 11:11 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 26 Sep 2014 09:11:34 +0000 (26 11:11 +0200)
tree2db5d2a2530fbde25f574dbbf735c84d8c9cef22
parent200eeb572318a3b8c02beb2e35e7df025d02dfea
parent4f81b8cac0a72560fda0e14c25becf2e6891f0a9
Merge branch 'maint'
lisp/ox.el