Merge branch 'maint'
commit95e318ae0688f9ca2b08cd1b37b19d6eb9ec6dc6
authorBastien Guerry <bzg@altern.org>
Fri, 16 Mar 2012 18:39:36 +0000 (16 19:39 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 16 Mar 2012 18:39:36 +0000 (16 19:39 +0100)
tree743fc398d75c036fd5209587fa0af1b3e19c3cc0
parentb66ff157e1930453cc7843328aadd671b228ec72
parent490ef86497367f282222d849280ac6d406d1cad2
Merge branch 'maint'
lisp/org-habit.el
lisp/org-src.el
lisp/org.el