Mathias Meyer 0cd89de38a Merge branch 'master' into rkh-metrics ... Conflicts: Gemfile.lock		2013-05-09 13:37:28 +02:00
..
integration	Fix scopes and access token specs	2013-05-08 14:11:03 +02:00
support	oh and the spec cares too	2013-03-25 16:16:42 +01:00
unit	Merge branch 'master' into rkh-metrics	2013-05-09 13:37:28 +02:00
spec_helper.rb	Use client_domain instead of domain for url in CC.xml	2013-03-25 16:53:20 +01:00