Merge branch 'maint'
commitf91968bc38cac2ef4658327f35ecfa52fb405793
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Sep 2015 12:29:19 +0000 (10 14:29 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Sep 2015 12:29:19 +0000 (10 14:29 +0200)
treeed8f2d59a06970a9d593f1b125aa449908f70f20
parentde9a4fc57625bd60c4651679f83b361e2d916bf1
parentbde1ebc20ae5c3633d2f405117f7ee67566b5a5f
Merge branch 'maint'
contrib/lisp/ox-koma-letter.el
doc/org.texi
lisp/org-agenda.el