Tagging for release pb_2012_10_10_a
Tagging for release testy
Tagging for release 205pm
Tagging for release v2.000
Tagging for release v2.002
Tagging for release v2.003
Tagging for release v2.004
Tagging for release v2.007
Merge remote-tracking branch 'origin/master' into release

Conflicts:
	config/deploy/production.rb
	config/deploy/staging.rb
Merge remote-tracking branch 'origin/master' into release
Tagging for release v2.008
Tagging for release v2.009
test change 1
test change 2
test change 3
Merge commit '7b2ef4e3430e937751bac45217a12f7cee9095f2' into release
Tagging for release v2.012
Merge commit 'b2ede5287a73817f0c960798bc23460e7da9b2cb' into release
Tagging for release v2.013
Merge branch 'stager' of https://github.com/cortry/testrepo into stager