]> git.ipfire.org Git - pakfire.git/commitdiff
Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Jul 2011 13:07:26 +0000 (15:07 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Jul 2011 13:07:26 +0000 (15:07 +0200)

Trivial merge