Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2014 11:07:06 +0000 (12:07 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2014 11:07:06 +0000 (12:07 +0100)
1  2 
lisp/org-agenda.el
lisp/org.el

Simple merge
diff --cc lisp/org.el
Simple merge