Replace search and caret with icon-font
Merge branch 'master' of github.com:openshift/origin-server into various-work
Merge pull request #1650 from sg00dwin/various-work

Merged by openshift-bot
add cart vendor and version
remove java-devel BuildRequires, move ROOT.war jar to configure
Fix for bug 918966
Removing constraints from routes and adding regex checks in controllers
Adding additional checks to oo-admin-chk script
remove java-devel BuildRequires, move ROOT.war jar to configure
Merge pull request #1654 from danmcp/master

Add cart vendor and version
remove java-devel BuildRequires, move ROOT.war jar to configure
Merge pull request #1657 from abhgupta/abhgupta-admin-chk

Merged by openshift-bot
Merge pull request #1656 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1655 from bdecoste/master

Merged by openshift-bot
Disable check for quota over ssh on Fedora
DIY Cartridge 2.0