]> git.ipfire.org Git - pakfire.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire into sat
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Jul 2011 09:16:57 +0000 (11:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Jul 2011 09:16:57 +0000 (11:16 +0200)
commit6853dbc439cc19e5c3fee6de6e4e0bf699e8142f
treec3910808053a4aa0cf5eb94ab96be526721306f5
parent714392de4f3336e978f8751a61bb00974a34ab4b
parentd403e7b3a1203e110572dafe765177265ce2bcad
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire into sat

Conflicts:
pakfire/base.py
pakfire/repository/index.py
pakfire/base.py
pakfire/cli.py