tree 70a121dec56053b26642c9518d8e56efdab4175c
parent 62927459e0ae11cca5b35956256746e80b2d50b1
parent 2dd7d2f03fe637a7cf5c7b48eba8720744d3e24d
author Samuel A. Falvo II <sam.falvo@rackspace.com> 1404171080 -0700
committer Samuel A. Falvo II <sam.falvo@rackspace.com> 1404171080 -0700

Merge branch 'master' into v0.2.0

Conflicts:
	acceptance/19-list-addresses-0.1.go
	servers.go

I really need to do this more often.