Add Python 3.3 support.
Add 'plan_history' to CloudUser model.
oo-admin-ctl-usage will also cache 'plan_history' and will pass to sync_usage().
Add social sharing links
Bug 950367 - Handle non-integer values for expires_in

Any param value of expires_in outside the range of 0..max_expires should be treated as the default value.
Bug 928668 - Provide better gear storage messages

Use terminology more in keeping with our UI messaging
Ruby v2 cartridge work
Roll 'build' logic into 'control' script in Ruby cartridge.
Postpone implementing pre-build, post-deploy and threaddump in Ruby v2.
Correct the log directory to clean up during tidy in Ruby v2 cartridge
eapv2 clustering
Calling oo-admin-cartridge from a few more v2 cartridges
oo-admin-broker-auth manpage fix
Labeling a few cucumber tests as @not-enterprise
<haproxy_ctld> Bug 920990 - fix p_usage showing usage message twice

updated p_usage method to drop straight out of program (via exit!) after
displaying usage instead of raising the "exit" exception
Merge pull request #1752 from BanzaiMan/ruby_v2_work

Further work on v2 Ruby cartridge
Update README.writing_cartridges.md
Merge pull request #1994 from mrunalp/dev/py33

Merged by openshift-bot
WIP Cartridge Refactor - Support for version overrides in manifest

* Take version choice in ctor
WIP Cartridge Refactor - update versions in manifest to be strings
WIP Cartridge Refactor - Finish context checking