tree 83dd94d46d19aca4d95d80ccde62d209c73dff14
parent 5266e49cf3097f1ee9062a1731fa137a5ac4d0a6
parent e69059d9c42b46df908bd68ed47dccce3046e1c2
author Ash Wilson <smashwilson@gmail.com> 1410366546 -0400
committer Ash Wilson <smashwilson@gmail.com> 1410366546 -0400

Merge remote-tracking branch 'upstream/v0.2.0' into identity-v3

Conflicts:
	acceptance/openstack/compute/tools_test.go