Merge branch 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git...
authorSeth Vidal <skvidal@fedoraproject.org>
Fri, 11 Jun 2010 14:50:18 +0000 (10:50 -0400)
committerSeth Vidal <skvidal@fedoraproject.org>
Fri, 11 Jun 2010 14:50:18 +0000 (10:50 -0400)
* 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git/createrepo:
  Don't use /usr/bin/env ... it's evil
  --database is now the default for mergerepo too, have --no-database in completions instead.


Trivial merge