Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 10 Jan 2013 11:15:37 +0000 (12:15 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 10 Jan 2013 11:15:37 +0000 (12:15 +0100)
1  2 
lisp/org-agenda.el

Simple merge