Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 21:28:47 +0000 (22:28 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 21:28:47 +0000 (22:28 +0100)
commitb8104315d3abfdd385fa5c3d1900e08ffe30fa27
treedd0494737918ff1f970cbdb0c95e51b8d43f170f
parent196c5797d20e13c122097d1e3d3adf0969c8e59b
parent62c3107eb2dfa7a75fae13da151eafb7535b8ab6
Merge branch 'maint'

Conflicts:
lisp/org-agenda.el
lisp/org-agenda.el