Merge branch 'maint'
commit92d84410efeef733725d397fc3719cf02ea75816
authorBastien Guerry <bzg@altern.org>
Thu, 22 May 2014 10:56:18 +0000 (22 12:56 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 22 May 2014 10:56:18 +0000 (22 12:56 +0200)
treea818eb81df1d63c5d8824b674970a0881c9e371c
parent1ca86f555ffd2dd8e0097f4474c7ac029fd00712
parent445a8ec66efce091da92d9d65471fcaaa7b27cc0
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el