bbockelm/condor — pull request #3 by zhangzhehust (2012-12-17 04:51:07+00:00)
Title: Resolve the merge conflict with network_netlink.cpp

Keep updated from your repo and resolve the merge conflict with network_netlink.cpp that has IPv6 support.