]> git.ipfire.org Git - pakfire.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Oct 2011 10:46:11 +0000 (12:46 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Oct 2011 10:46:11 +0000 (12:46 +0200)
commitccccc3116c0512b7f7caa8d54b6334d80e8e36e3
treeabb72c4ffd0f5d8d9c6aebb67b570a66fc88c813
parent1710ccec5c14067da6b92bee5122baf0de391cf2
parent8834f7c93f00e44b75352432165775dece832c1a
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
po/pakfire.pot
po/pakfire.pot
python/pakfire/base.py
python/pakfire/cli.py