Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Sat, 17 Mar 2012 01:01:34 +0000 (21:01 -0400)
committerRich Felker <dalias@aerifal.cx>
Sat, 17 Mar 2012 01:01:34 +0000 (21:01 -0400)
1  2 
COPYRIGHT

diff --cc COPYRIGHT
Simple merge