]> git.ipfire.org Git - pakfire.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Jul 2011 11:34:47 +0000 (13:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Jul 2011 11:34:47 +0000 (13:34 +0200)
1  2 
pakfire/cli.py

diff --cc pakfire/cli.py
Simple merge