Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Sep 2013 10:52:43 +0000 (12:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Sep 2013 10:52:43 +0000 (12:52 +0200)
1  2 
Makefile.am

diff --cc Makefile.am
Simple merge