]> git.ipfire.org Git - people/stevee/pakfire.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Feb 2012 11:39:39 +0000 (12:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Feb 2012 11:39:39 +0000 (12:39 +0100)
commit36ee37ab5e8418ff558e29e88b9a863fb8843cec
tree701686d9b0ff6d2ae8ac0bbce91c300d27cf1be1
parenta6bd96bc21b25c8d08f1a6436dd3598fe615f129
parent25a9863294b44d4535247b00291bc07b4b36148a
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

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