]> git.ipfire.org Git - people/stevee/pakfire.git/commitdiff
Merge branch 'perl-fixes'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 Dec 2011 13:43:24 +0000 (14:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 Dec 2011 13:43:24 +0000 (14:43 +0100)
Conflicts:
python/pakfire/packages/make.py

1  2 
python/pakfire/packages/make.py

Simple merge