Steven Bazyl a9d46c0359 Resolve merge conflict		2012-06-06 17:32:29 -07:00
..
api_client	Resolve merge conflict	2012-06-06 17:32:29 -07:00
api_client_spec.rb	Allow credentials on per-request basis	2012-06-06 17:27:20 -07:00