nodejitsu/nssocket — comment on commit 551d4535816ed43e5a66d583834dfe23725eeace
File:  line 0
By indexzero:

Merge commits make puppies cry. :(