Merge branch 'maint'
commit370a2bfb4f2530b6a8e3a4f12358810413198081
authorBastien Guerry <bzg@altern.org>
Thu, 27 Jun 2013 15:02:50 +0000 (27 17:02 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 27 Jun 2013 15:02:50 +0000 (27 17:02 +0200)
treee23b724b291da2939d04036a6e54a029e7b2dbff
parentb01871f23e241d4392d46d7e106d1df8958fccac
parent311856590575807b4dc98a109603bc5e846d60b6
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el