]> git.ipfire.org Git - pakfire.git/commitdiff
Merge remote-tracking branch 'origin/sat' into sat
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Jul 2011 16:33:32 +0000 (18:33 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Jul 2011 16:33:32 +0000 (18:33 +0200)

Trivial merge