Merge branch 'maint'
commit15426c6fd003c13341e07fabeed614f5d0ec98b0
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 00:20:21 +0000 (20 01:20 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 00:20:21 +0000 (20 01:20 +0100)
tree119aa72f64401b5d543a9a220c8ba269e42d934e
parentfd9b262d94df7713e6496284bdb09627e4dbe7a3
parent963ede0a9d9f439f9ef4e5f0a4c5b01ddf07ca42
Merge branch 'maint'
lisp/org.el