Merge branch 'maint'
commit096c5644f712a41fa0e3198b94b1504541672c28
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 10:13:39 +0000 (20 11:13 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 10:13:39 +0000 (20 11:13 +0100)
tree8513b55ed7b216e190f0321bfb15b8d775f7cb27
parent5267cfc6fb7474351db791d253171f6eefbcf9fa
parentdfa3c74e34ee115dcb6095f88db86b144ae7b70b
Merge branch 'maint'
lisp/org.el