Merge branch 'maint'
commitbf27c6b71f8b3d94046e80800bd2e4b32f117e2e
authorBastien Guerry <bzg@altern.org>
Mon, 24 Mar 2014 05:29:26 +0000 (24 06:29 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Mar 2014 05:29:26 +0000 (24 06:29 +0100)
tree03576aa90da2aab945574d0124fa1749fb1eacbb
parentcb91729595f896cc7fd9499e2250661c5dd2f49f
parentc4bca1c38496e34e43528fb33f53200637517e00
Merge branch 'maint'
contrib/lisp/ox-rss.el
lisp/org-clock.el