Merge branch 'lcdproc' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 May 2013 18:01:32 +0000 (20:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 May 2013 18:01:32 +0000 (20:01 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge