Merge branch 'maint'
commitf5380d122146a99bd497b8ae235382c21d0f8e3e
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 10 Jan 2014 10:25:15 +0000 (10 11:25 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 10 Jan 2014 10:25:15 +0000 (10 11:25 +0100)
treeaa9325dad45cf92d952322bc46772cf17a475e0b
parentfcdf05b141adcd835bd687db3b1531fc81c4f390
parent8720c4980724229545755b08fbac1724cd2e74be
Merge branch 'maint'
lisp/org.el