Merge branch 'maint'
commit09f108ec576f6c7a7a33d0a3cdec9478ad1c9627
authorBastien Guerry <bzg@altern.org>
Sat, 12 Jan 2013 08:20:22 +0000 (12 09:20 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 12 Jan 2013 08:20:22 +0000 (12 09:20 +0100)
treeed6df12610c60eb5b50188e0d66112be6653e8f4
parent0499f0a939ce360b96bd45ab88a8505e4f8ab71d
parenta0ad34b8d432b513d476f44e5da5ae31f9039516
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-capture.el