]> git.ipfire.org Git - people/ms/pakfire.git/commit
Merge branch 'signatures'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Mar 2012 12:21:00 +0000 (13:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Mar 2012 12:21:00 +0000 (13:21 +0100)
commit6b25d4f18aa9c3ed9ed3664fd178009d0c64cba9
treeae5199702db5e3f2129c98bb0ca13c564be9ecfd
parent5afb6c7ffa13d898382416ef805be9dc60d66308
parent6ae7ac951e8b0934007d42f4bbff24d9f2fb3fea
Merge branch 'signatures'

Conflicts:
po/pakfire.pot
python/pakfire/api.py
python/pakfire/base.py
python/pakfire/cli.py
python/pakfire/constants.py
python/pakfire/repository/index.py
python/pakfire/repository/local.py