Merge branch 'hotfix-7.8.06'
commita5774431b3471f0af7c21af3e078dcd33c6754b8
authorBastien Guerry <bzg@altern.org>
Mon, 2 Apr 2012 14:46:02 +0000 (2 16:46 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 2 Apr 2012 14:46:02 +0000 (2 16:46 +0200)
treeaae9b96784b85680a302924e87c754ac2809cc51
parentc9948bc9060c17a3bb688faad72f081e7de81a71
parent7ea4efd4112176cbd847c16d86a53b263fde50c0
Merge branch 'hotfix-7.8.06'
lisp/org-agenda.el
lisp/org.el