Merge branch 'maint'
commit69133332aa626d499fe1a8c87ddfdc5a32f43230
authorBastien Guerry <bzg@altern.org>
Fri, 11 Jan 2013 11:31:51 +0000 (11 12:31 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 11 Jan 2013 11:31:51 +0000 (11 12:31 +0100)
tree590ae3cb4094070a9cff9216533b55e4012ca92f
parentdb7ece9fa2e27944d9482961af9bfd9d08bb3b51
parentde10210cf9805df3e4df1f807d0c609f6f24f296
Merge branch 'maint'
lisp/org.el