Merge branch 'maint'
commit05cd942f3140e4935e44d28dbde46e16daf6d606
authorBastien Guerry <bzg@altern.org>
Sun, 9 Feb 2014 13:54:23 +0000 (9 14:54 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 9 Feb 2014 13:54:23 +0000 (9 14:54 +0100)
tree9c19de922b1dfef88b4ac32399fbbc142dfe11c9
parent7fd1838e78a5b7b8b4d04e61396dd15a75cda133
parent0ceb68d59931531db78b2b0c71b6b4a0050a682a
Merge branch 'maint'
lisp/org-src.el