tree dcc8506b06ad1c5169cb5ff9920ffba0d42752d5
parent 5b32ca7f1c2fc99bfa522540a3865222b8c99be4
parent f36c4307a70dfd521e75b94efec09e3ad66a27d9
author Ash Wilson <smashwilson@gmail.com> 1413980191 -0400
committer Ash Wilson <smashwilson@gmail.com> 1413980191 -0400

Merge remote-tracking branch 'upstream/v0.2.0' into rackspace-compute

Conflicts:
	acceptance/README.md
	rackspace/client.go