Merge branch 'maint'
commita72d2e5d5d773cb771b89abd00839a766eedbcff
authorBastien Guerry <bzg@altern.org>
Sat, 24 May 2014 12:13:17 +0000 (24 14:13 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 24 May 2014 12:13:17 +0000 (24 14:13 +0200)
tree257b7feae627b2f2a4fe3b87864452c56272989f
parent60c8ef56736f2601ebe1ff5fc64c43949de83e9c
parent7e5965372d4c5877909dcb29e6e19209ddba4611
Merge branch 'maint'
lisp/org-timer.el