tree fc10214239e644267e5ad47867533dde9c421f5d
parent dc7daa837ec2bde984abf96d1962986ee17e8aae
parent a96073165a75924461ca330b511fd1b0c2b9b681
author Ash Wilson <smashwilson@gmail.com> 1411580645 -0400
committer Ash Wilson <smashwilson@gmail.com> 1411580645 -0400

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

Conflicts:
	openstack/client.go