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)
commit93a50a26cd0f9efc59cc83daae7b2d916b327ab1
treeada41a23c4b01f27d1d2cf8cd88948b061aa8f61
parent2cbb24bba39ad3529315098b5619b6fec078eb82
parent40305f74bd70a575ce73260227ed3b64e0625b13
Merge remote branch 'nsz/master'
COPYRIGHT