Merge branch 'maint'
commitf9d4069033e90a538664ee443501e4ef2cd618b7
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 28 Apr 2012 20:37:23 +0000 (28 22:37 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 28 Apr 2012 20:37:23 +0000 (28 22:37 +0200)
tree4aef37c3db15ddc8ddc9fdde5931ca2cf7acd36f
parent7e155ecfbcc7358c6c8b09b7d9cd872d4a8d393f
parent7f2e22339cc928eaf594025e82a159cce6b9d550
Merge branch 'maint'
lisp/org.el