Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 17:40:01 +0000 (8 18:40 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 17:40:01 +0000 (8 18:40 +0100)
1  2 
lisp/org-agenda.el

Simple merge