]> 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>
Mon, 30 Jan 2012 18:32:24 +0000 (19:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 30 Jan 2012 18:32:24 +0000 (19:32 +0100)

Trivial merge