]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
Merge branch 'master' of git://dev.medozas.de/libkmod
authorLucas De Marchi <lucas.demarchi@profusion.mobi>
Sat, 24 Dec 2011 19:39:44 +0000 (17:39 -0200)
committerLucas De Marchi <lucas.demarchi@profusion.mobi>
Sat, 24 Dec 2011 19:39:44 +0000 (17:39 -0200)
1  2 
Makefile.am

diff --cc Makefile.am
Simple merge