Merge branch 'maint'
commitcadffe8e1a75ab09a0ac8b734c19e0846743f37e
authorBastien Guerry <bzg@altern.org>
Thu, 7 Feb 2013 09:03:10 +0000 (7 10:03 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 7 Feb 2013 09:03:10 +0000 (7 10:03 +0100)
tree301fd8e0a67d7da07339f4686be7a2cf0874c0f1
parentc857077351520667c14f61491d8476ad133f74de
parentfa55168d262cd2fbcf35d40474a7466502ea7836
Merge branch 'maint'
lisp/org-id.el