]> git.ipfire.org Git - pakfire.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Sep 2014 11:26:32 +0000 (13:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Sep 2014 11:26:32 +0000 (13:26 +0200)

Trivial merge