]> 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>
Thu, 10 Mar 2011 17:56:51 +0000 (18:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 10 Mar 2011 17:56:51 +0000 (18:56 +0100)
1  2 
pakfire/packages/file.py

Simple merge