]> 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 13:41:48 +0000 (15:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jul 2011 13:41:48 +0000 (15:41 +0200)

Trivial merge