Merge branch 'maint'
commitef3706ba925c4b58097e3987c66b46511e60a1f7
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 1 Sep 2012 19:39:08 +0000 (1 21:39 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 1 Sep 2012 19:39:08 +0000 (1 21:39 +0200)
treed9066bb1d6bf5b3f7dad64a95e21006c5cfc309d
parent79bf7dfe7eb8704d0a507c273441e47f2f425026
parent4026f2e3addc603531bf5a7f04307eff6bd0eda6
Merge branch 'maint'
lisp/org.el