24012013 14:35
Merge branch 'master' of https://github.com/prplatform/rspec_test

Conflicts:
	specs/oracle_spec.rb
Merge branch 'master' of https://github.com/prplatform/rspec_test
status 29012013 11:18