Merge branch 'maint'
commitb879590f3ba285198344f7cded47b96fd576df29
authorBastien Guerry <bzg@altern.org>
Thu, 8 Mar 2012 12:50:51 +0000 (8 13:50 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 8 Mar 2012 12:50:51 +0000 (8 13:50 +0100)
tree04c33c174acc869f8d8db2901374049d5c525c80
parente896ca67073dbd1422078324fcb763e730134701
parent11e441e85f532e94cb990397c22235e1b6c48a13
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-list.el
lisp/org.el