Merge branch 'maint'
commit1c9aa1e78e97078202480f328e0b370f31902123
authorBastien Guerry <bzg@altern.org>
Mon, 16 Jun 2014 09:41:36 +0000 (16 11:41 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 16 Jun 2014 09:41:36 +0000 (16 11:41 +0200)
tree98b6e311d85214d887e1fe19f326785e1ff6d85d
parentb414844daac3ef239419168ede9bd15808dc47da
parent5556865893bd64b3df928968875e08df97ca6b44
Merge branch 'maint'
lisp/org-agenda.el