Merge remote-tracking branch 'nsz/exp'
authorRich Felker <dalias@aerifal.cx>
Tue, 14 Aug 2012 01:55:22 +0000 (21:55 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 14 Aug 2012 01:55:22 +0000 (21:55 -0400)
commit2d93d6446191def352b8913e859d6104f1398c72
tree5e78785c31eb7cb7623bb63c04e62737d9171003
parentab76321c14e18e70c853f34202a567749292eafc
parent1fb01691547e85be253a4f1543be3920de651e27
Merge remote-tracking branch 'nsz/exp'