Merge branch 'maint'
commit7f21cfc65802d30b2de19899c6e193eba9b83e3f
authorBastien Guerry <bzg@altern.org>
Mon, 28 Jul 2014 16:08:44 +0000 (28 18:08 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 28 Jul 2014 16:08:44 +0000 (28 18:08 +0200)
treea8c42e633a1a6ff09b9f4fdc69c7192eff0a4969
parent63160e9aabf52a6814f0b33e0bfc9f8861d03dc8
parent1387694888facf7a47304bfe272e95544086221c
Merge branch 'maint'
lisp/org-capture.el