Merge branch 'maint'
commit871a041ab9e398a2063d4304433da4b81176a22c
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 20:38:39 +0000 (29 22:38 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 20:38:39 +0000 (29 22:38 +0200)
tree50f5284b0949353acb6bba1062510dd4a94b6084
parentd52e988c362155d55435323626ea14b24657bdd5
parentd9e5aed2aa5ea9e1df20d308a67d0bcaaa7b6e8a
Merge branch 'maint'
lisp/org.el