]> git.ipfire.org Git - pakfire.git/commitdiff
Merge branch 'master' of git://git.ipfire.org/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 15:32:17 +0000 (11:32 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 15:32:17 +0000 (11:32 -0400)

Trivial merge