Merge branch 'maint'
commitbef53d7f672e9ddca971260ec09cb53f1b2084de
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 20 Oct 2012 09:59:07 +0000 (20 11:59 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 20 Oct 2012 09:59:07 +0000 (20 11:59 +0200)
tree2ea7f833f69a0c4f2ca4d1c542bfa36e0ab04c34
parent6f7e92bdb64bbc305a10d4ebe31e9a3ee8e87580
parent93040f46714f4b94ebbbd0ff8c3ccf58ae3437c5
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el