Hiro Asari 8ce826cda0 Merge branch 'master' into hh-add-metadata-endpoint ... Conflicts: Gemfile.lock		2014-01-20 22:30:35 -05:00
..
integration	Merge branch 'master' into hh-add-metadata-endpoint	2014-01-20 22:30:35 -05:00
support	Cast in matcher as well	2013-11-19 01:23:47 -05:00
unit	Merge branch 'master' into hh-add-metadata-endpoint	2014-01-17 09:16:41 -05:00
spec_helper.rb	Require travis/testing explicitly	2013-11-08 11:05:55 +01:00