Merge branch 'fix-org-diary-bug' into fix-compiler-warnings
commit982b7b972f2927b9f92b55e08e0dcacb21a015bd
authorBastien Guerry <bzg@altern.org>
Sat, 28 Apr 2012 20:23:40 +0000 (28 22:23 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 28 Apr 2012 20:23:40 +0000 (28 22:23 +0200)
tree6fb3fcfd91f2777ddbfe8d6d9f53133bbd143ae6
parentc5f73635d085d9d9e92d8baf062015cbe00f97da
parent4b8359a3950aec71f2190d9374ae09971d8bfede
Merge branch 'fix-org-diary-bug' into fix-compiler-warnings
lisp/org-agenda.el