Medium: xml: Support resource container in the 1.2 schema
Test: tools: Update regression tests for new error codes
Fix: Allow programs in the haclient group to use CRM_CORE_DIR
Merge branch 'master' of github.com:ClusterLabs/pacemaker
Fix Debian init script default runlevels and stop deps

On Debian incorrect stop dependencies caused corosync hang on reboot.
Fix: tools: crm_mon - Print a timing field only if its value is non-zero
Low: test: Add pacemaker_remote component test to buildbot tests
Low: lrmd: Regression test detects state directory during build
Low: fencing: fixes log msg
Low: fencing: Updates to stonith regression test
Merge pull request #272 from davidvossel/regression_test_updates

Regression test updates
Merge pull request #271 from gao-yan/crm_mon_time

Fix: tools: crm_mon - Print a timing field only if its value is non-zero
Merge pull request #258 from gao-yan/container-schema

Medium: xml: Support resource container in the 1.2 schema
Merge pull request #270 from realloc/master

Fix Debian init script default runlevels and stop deps
Fix: Use custom OCF_ROOT_DIR if requested
Feature: mcp: Prevent the cluster from trying to use cman even when it is installed
Log: crmd: Record trace data when election loops are detected
Log: pengine: Drop message severity
Log: crmd: More accurate log for A_RECOVER
Log: mcp: Update help text