Merge branch 'maint'
commitd5c11e6b5a8f0f0d8288a8bbfe6c05f40f64c45f
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 9 Jul 2013 11:53:36 +0000 (9 13:53 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 9 Jul 2013 11:53:36 +0000 (9 13:53 +0200)
treebfcb870f688e0b98a3934b9be99d5ccf900504ed
parentfe8bfb8bd931fda3be2451267c9a1ffbdff064ba
parentc78fa35252762f3b085fd987d5e8c161546c82ee
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el