Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 11 Jul 2013 12:33:18 +0000 (14:33 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 11 Jul 2013 12:33:18 +0000 (14:33 +0200)
commit918551cec836b89c4f55bb1acf2626a939b9d1ee
tree299b29edeb942122ebd317ac4f99962f945d4fe9
parent203f4c9b056a41a940f659fa5d2c66437bdb70db
parent202c5895b1495916654c187a0f91c4c563d02f51
Merge branch 'maint'
lisp/org.el