If the command uses multipart forms, do not pass up json.
regerating API bindings based off of commit: 647bbac in Katello/katello
Merge pull request #27 from komidore64/regen0.0.6

regerating API bindings based off of commit: 647bbac in Katello/katello
dialing back gem dependency for json

RHSCL only has rubygem-json-1.5.5
bump version to 0.0.7
Merge pull request #28 from komidore64/rhscl-json

dialing back gem dependency for json
Merge pull request #26 from bkearney/bkearney/upload_manifest

If the command uses multipart forms, do not pass up json.
gemspec - loosening a gem dependency to accomodate RHEL6
Merge pull request #30 from komidore64/json-dep-fix

gemspec - loosening a gem dependency to accomodate RHEL6
regenerating from upstream

saw changes to sync-plans

bumped version to 0.0.8
Merge pull request #31 from komidore64/regen

regenerating from upstream
Content view composite api
Merge pull request #35 from daviddavis/temp/20140224162433

Content view composite api
add rpm spec file
Merge pull request #36 from jmontleon/add-rpm-spec

add rpm spec file
Merge remote-tracking branch 'upstream/master' into content-views

Conflicts:
	doc/KatelloApi.html
	doc/KatelloApi/Base.html
	doc/KatelloApi/Generator.html
	doc/KatelloApi/Generator/Base.html
	doc/KatelloApi/Resources.html
	doc/KatelloApi/Resources/About.html
	doc/KatelloApi/Resources/ActivationKey.html
	doc/KatelloApi/Resources/Architecture.html
	doc/KatelloApi/Resources/Changeset.html
	doc/KatelloApi/Resources/ChangesetsContent.html
	doc/KatelloApi/Resources/ComputeResource.html
	doc/KatelloApi/Resources/ConfigTemplate.html
	doc/KatelloApi/Resources/ContentUpload.html
	doc/KatelloApi/Resources/ContentView.html
	doc/KatelloApi/Resources/ContentViewDefinition.html
	doc/KatelloApi/Resources/Crl.html
	doc/KatelloApi/Resources/CustomInfo.html
	doc/KatelloApi/Resources/Distribution.html
	doc/KatelloApi/Resources/Distributor.html
	doc/KatelloApi/Resources/Domain.html
	doc/KatelloApi/Resources/Environment.html
	doc/KatelloApi/Resources/Erratum.html
	doc/KatelloApi/Resources/Filter.html
	doc/KatelloApi/Resources/FilterRule.html
	doc/KatelloApi/Resources/GpgKey.html
	doc/KatelloApi/Resources/HardwareModel.html
	doc/KatelloApi/Resources/Organization.html
	doc/KatelloApi/Resources/OrganizationDefaultInfo.html
	doc/KatelloApi/Resources/Package.html
	doc/KatelloApi/Resources/Permission.html
	doc/KatelloApi/Resources/Ping.html
	doc/KatelloApi/Resources/Product.html
	doc/KatelloApi/Resources/ProductsBulkAction.html
	doc/KatelloApi/Resources/Provider.html
	doc/KatelloApi/Resources/PuppetModule.html
	doc/KatelloApi/Resources/RepositoriesBulkAction.html
	doc/KatelloApi/Resources/Repository.html
	doc/KatelloApi/Resources/RepositorySet.html
	doc/KatelloApi/Resources/Role.html
	doc/KatelloApi/Resources/RoleLdapGroup.html
	doc/KatelloApi/Resources/SmartProxy.html
	doc/KatelloApi/Resources/Statu.html
	doc/KatelloApi/Resources/Status.html
	doc/KatelloApi/Resources/Subnet.html
	doc/KatelloApi/Resources/Subscription.html
	doc/KatelloApi/Resources/Sync.html
	doc/KatelloApi/Resources/SyncPlan.html
	doc/KatelloApi/Resources/System.html
	doc/KatelloApi/Resources/SystemErratum.html
	doc/KatelloApi/Resources/SystemGroup.html
	doc/KatelloApi/Resources/SystemGroupErratum.html
	doc/KatelloApi/Resources/SystemGroupPackage.html
	doc/KatelloApi/Resources/SystemPackage.html
	doc/KatelloApi/Resources/SystemsBulkAction.html
	doc/KatelloApi/Resources/Task.html
	doc/KatelloApi/Resources/Template.html
	doc/KatelloApi/Resources/TemplatesContent.html
	doc/KatelloApi/Resources/Uebercert.html
	doc/KatelloApi/Resources/User.html
	doc/_index.html
	doc/class_list.html
	doc/file.README.html
	doc/index.html
	doc/method_list.html
	doc/top-level-namespace.html
	lib/katello_api/documentation.json
	lib/katello_api/resources/system_group.rb
Merge pull request #38 from daviddavis/temp/20140304102002

Merging master into content-views
Update for content views.