Merge branch 'maint'
commit560c3adedb07b77f6eb801c97bfa7cb3f78f5bfc
authorBastien Guerry <bzg@altern.org>
Thu, 12 Jun 2014 13:25:56 +0000 (12 15:25 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 12 Jun 2014 13:25:56 +0000 (12 15:25 +0200)
treed884ae1871b77a555e1b90af7908f6fdf752845a
parentbb61df9d911c458ca0b7c1069e49358b7bd404dc
parentfeca87b9ac4610ef2760f0c16bbce7ddfeb5f163
Merge branch 'maint'
lisp/org.el