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

Simple merge