Merge branch 'maint'
commite0879b03d08bb4acc663084076370482f61e8698
authorMarco Wahl <marcowahlsoft@gmail.com>
Mon, 12 Jan 2015 12:02:20 +0000 (12 13:02 +0100)
committerMarco Wahl <marcowahlsoft@gmail.com>
Mon, 12 Jan 2015 12:02:20 +0000 (12 13:02 +0100)
tree87eb9ee6393913aa106fce0be0fd32e3d946cddd
parent86588d65013edcb2614c715551eecaaba35d2a3a
parentca21b7b86dc6acd6feec0d28a3a53be62d9e1fa5
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-clock.el
lisp/org.el