Fix location of smart proxy not mergable file
added OFI plugin
Update cron.pp
Update cron.pp
Merge pull request #93 from ohadlevy/ofi

added OFI plugin
Add missing template for Kafo Parsers
Merge pull request #94 from ares/kafo_parsers_prs_3

Add missing template for Kafo Parsers
Add project to slave::pr_test_config
Merge pull request #95 from ares/kafo_parsers

Add project to slave::pr_test_config
Bumping Bower to 1.3.1.
Merge pull request #96 from ehelms/bower-bump

Bumping Bower to 1.3.1.
Add augeas-devel to slaves
Automatic SSH host key acceptance for Jenkins
Add snapshot plugin repo
Limit lifetime of passenger redmine processes
Merge pull request #98 from domcleal/passenger-limit

Limit lifetime of passenger redmine processes
Adding some more katello projects to redmine cron
Merge pull request #99 from daviddavis/temp/20140327091730

Adding some more katello projects to redmine cron
Adding hammer-cli-csv to the redmine cron task
Merge pull request #100 from daviddavis/temp/20140327192928

Adding hammer-cli-csv to the redmine cron task