Merge branch 'maint'
commit3380460c69cac63821bcc43a5342f8470e859d3e
authorBastien Guerry <bzg@altern.org>
Mon, 4 Feb 2013 23:11:08 +0000 (5 00:11 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 4 Feb 2013 23:11:08 +0000 (5 00:11 +0100)
tree91a3d33a3e397b6070161038b800053befdfbfac
parent60b13f3dfe19e49f99a580db111112280b326095
parentf27e1e8e4d6ffd3f92287a4a9122e752238c1bb3
Merge branch 'maint'
lisp/org.el