Ignore rbenv's local marker
replacing put requests by patch for rails 4 compatibility
Merge pull request #98 from gopesht/make_routes_compatible_with_rails4

replacing put requests by patch for rails 4 compatibility
Merge pull request #92 from bear454/master

Ignore rbenv's local marker
Merge branch 'master' of https://github.com/openSUSE/osem into tests