Merge branch 'maint'
commit8c5b47935fd10ce692e86819b328c2f6866e658e
authorBastien Guerry <bzg@altern.org>
Sun, 6 Jan 2013 11:46:33 +0000 (6 12:46 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 6 Jan 2013 11:46:33 +0000 (6 12:46 +0100)
treebff6648387ed7dbf22f9082e22528abe4192ea2a
parentb75b46620b2dd928292b304dfe1bbd10aed71297
parent7b26ec60a99992dc7a3ce11bad1d0977a4c82619
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el