]> 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>
Fri, 29 Jul 2011 15:41:32 +0000 (17:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jul 2011 15:41:32 +0000 (17:41 +0200)
1  2 
pakfire/repository/local.py

Simple merge