Merge branch '7.x-2.x' into 7.x-stable
changed profile to reference 7.x-stable branch in this branch 7.x-stable
Merge branch '7.x-2.x' into 7.x-stable

Conflicts:
	drupal-org.make
Merge branch '7.x-2.x' into 7.x-stable

Conflicts:
	drupal-org.make
changed erpal profile to 7.x-stable
changed custom modules to erpal-stable.make
Merge branch '7.x-2.x' into 7.x-stable
Merge branch '7.x-2.x' into 7.x-stable

Conflicts:
	drupal-org.make
Merge branch '7.x-2.x' into 7.x-stable
Merge branch '7.x-2.x' into 7.x-stable
Merge commit 'c1f63ffbb384ff9c615c171a47d3fbd24c71190e' into 7.x-stable
Merge commit '8484a2294d289e8bc76a331e2eb6c8603a1be82d' into 7.x-stable
Merge commit '000071e517fdc32319e73ddaa425787567227b34' into 7.x-stable
Merge branch '7.x-2.x' into 7.x-stable
Merge branch '7.x-stable' of git.drupal.org:project/erpal into 7.x-stable
Merge commit '4cdade2efb970e45dd0313caefbfaf562841c413' into 7.x-stable
Merge commit '2ca86bd1c328f7f57ebf7b22ccc0cb81d1ab551f' into 7.x-stable
Merge commit 'ecf1ea885861484ad55480b06ced2b4918c63786' into 7.x-stable
Merge commit '92dff0a6434e6c4ccff9d18b593a12f3f7770f1a' into 7.x-stable
Merge commit 'f9a00f2f7534b90236a78146ba4bf6d70695cb14' into 7.x-stable