Merge branch 'master' into 2.4.0

This commit is contained in:
Paul Beckingham 2014-01-15 22:17:30 -05:00
commit cd6067a39f
31 changed files with 139 additions and 219 deletions

View file

@ -2,7 +2,7 @@ The development of taskwarrior was made possible by the significant
contributions of the following people:
Paul Beckingham (Principal Author)
Federico Hernandez (Package Maintainer & Contributing Author)
Federico Hernandez (Principal Author)
David J Patrick (Designer)
John Florian (Contributing Author)
Cory Donnelly (Contributing Author)