Merge branch 'hotfix-7.8.06'
commiteb7f7159c9fb0a08bac802a9a2fbe0bd74ea7dab
authorBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 12:42:29 +0000 (23 13:42 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 12:42:29 +0000 (23 13:42 +0100)
treec9a72186d62135b79c9557251954ba52b2bb7719
parent1581b16c786816843d384f3751012fc6a61c3604
parent532a1ac40ad55fc092f65167eef360467c967b9d
Merge branch 'hotfix-7.8.06'
lisp/org-clock.el
lisp/org-crypt.el
lisp/org.el