]> 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, 28 Jul 2013 11:21:26 +0000 (13:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Jul 2013 11:21:26 +0000 (13:21 +0200)
1  2 
Makeconfig

diff --cc Makeconfig
Simple merge