Use diy instead of php since php-5.3 is not available on all platforms
Include psych gem only on F19 systems where it has been split out
Relax phpmyadmin version check
Add version check around DefaultRuntimeDir directive as it is available only on apache 2.4+
Fix ruby cartridge. It reuires a ~/.passenger dir on RHEL 6.4 systems
Fix some cucumber tests tags
MariaDB cartridge readme updates
Build RPM depending on which version of nodejs is available on the platform.
Make tests pick nodejs version based on what is installed
Nodejs spec fix
Loosen requirements on ci_reporter and minitest gems to we can use the
version distributed with fedora
Print warning instead of failing tests if there is an unknown auth plugin configured
Automatic commit of package [openshift-origin-cartridge-mariadb] release [0.0.1-1].
Fix jboss tests
Merge pull request #2776 from smarterclayton/fix_code_color

Use a gray for code color, merge steve's changes
<common> fix .spec so oo-diag is in non-scl locations
Automatic commit of package [rubygem-openshift-origin-console] release [1.10.1-4].
Merge pull request #2778 from sosiouxme/diagnostics

Merged by openshift-bot
mixin to include iconfont
Merge branch 'master' of github.com:openshift/origin-server into dev-general
Merge pull request #2779 from sg00dwin/dev-general

Mixin for iconfont
Merge pull request #2707 from kraman/f19_fixes

Merged by openshift-bot