]> git.ipfire.org Git - pakfire.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 4 Aug 2013 17:39:08 +0000 (19:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 4 Aug 2013 17:39:08 +0000 (19:39 +0200)

Trivial merge