]> 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>
Wed, 3 Aug 2011 20:53:11 +0000 (22:53 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 Aug 2011 20:53:11 +0000 (22:53 +0200)
1  2 
pakfire/packages/file.py

Simple merge