Merge branch 'maint'
commit0f0fa81dd0f2785b62a77a65fc569ebdfb9ba020
authorBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 11:43:18 +0000 (23 13:43 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 11:43:18 +0000 (23 13:43 +0200)
tree37cf0593481c70b32b72d3045a045ff23a274bb6
parent7384c96954409e00d6f1590cef4d0e082fc34443
parent1d57e1ac9ae5e7ddefe0b63a23728a241d3d99cb
Merge branch 'maint'
lisp/org-agenda.el