Rails32 - Setting haml declaration in 32 Gemfile to be consistent with regular Gemfile.  Re-factoring accessible_environments for readability.
Refactoring edit action in activation_keys controller
Merge pull request #1575 from jlsherrill/bz868917

868917 - fixing terminology of comparison on content search
Merge pull request #1528 from xsuchy/pull-req-msg

Fail if translation have less or more %s or \n
Rails32 - Adds compass-rails for Compass 0.12 on Fedora 18 and updates configuration file for compass for both version of compass 0.11.5 and 0.12.
Merge remote-tracking branch 'upstream/master' into content_views

Conflicts:
	src/app/controllers/activation_keys_controller.rb
	src/app/models/glue/pulp/repo.rb
	src/app/views/changesets/_edit.html.haml
	src/spec/models/changeset_spec.rb
content views - Rails32 - move tupane_layout declarations to views
Conflicts: 	src/app/controllers/roles_controller.rb
Menu - Fixes issue where menu updates did not correctly update API controller.
Merge pull request #1555 from ehelms/rails32-30-bridge

Rails 32 to 30 Bridge
886718 - allow better translation of one string

Original string has different translation depending on object_type.
I created several new strings with hardcoded object_type and
only left as variable in string "label".

This is quite ugly code, but I prefer it over ugly sentence as suggested
in:
https://bugzilla.redhat.com/show_bug.cgi?id=886718#c7
(even if it is grammatical correct).
Merge branch 'master' of https://github.com/Katello/katello into fast_import
fixing le test
Merge pull request #1591 from komidore64/custom-info

Custom info
Merge branch 'master' of https://github.com/Katello/katello into fast_import
Content views: addressing feedback from PR #1592
Content views: updating copyright years
Content views: fixing indentation in api cvd controller
Content views: removing 1.9 method sort_by!
Content views: fixed call to ChangesetContentException