Merge branch 'maint'
commitdad706d565585326fbbc56d0a64c741a5964c4a1
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 12 Jan 2012 17:37:36 +0000 (12 18:37 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 12 Jan 2012 17:37:36 +0000 (12 18:37 +0100)
tree628fc62e19827d873c8bf30260b597e09feff387
parent57f51dce5d85d74520c369ac8381faddbf6841aa
parent8c2f226b4d7cadc4fea2941e1bd3795f6adf8c2e
Merge branch 'maint'
lisp/org.el