Apply suggested workaround for CVE-2013-0156 as Dashboard does not use xml parameter parsing.
Update CHANGELOG, VERSION for 1.2.18
Merge branch '1.2rc'
Add addgroup, addclass, listgroups, listclasses tasks for nodes

Previously if a user wanted to use rake tasks to interrogate the dashboard
about which groups or classes a node belonged to, they would be out of luck.
Similarly, if a user wanted to add a class or group to a node without replacing
the already assigned classes/groups of a node it was not possible via only
rake. This commit adds a task in the node namespace to add a group or groups to
a node and to add a class or classes to a node. The other two tasks added here
list out the groups or classes already assigned to a node.
Fix descriptions of node tasks to match reality

The descriptions for the node:classes and node:groups tasks are misleading in
that they indicate that the classes and groups of a node can be edited or added
to using the task. The actual tasks will replace, and only replace, the classes
and groups for a node so this commit updates those descriptions to indicate
that.
Fix for CVE-2013-0155
Add get_node helper method to node.rake

As there was a large quantity of repeated code in the node rake tasks, this
commit adds a helper method to get a node from the name environment variable
and to exit with error if the node doesn't exist or can't be found.
Merge pull request #164 from MosesMendoza/security/1.2rc/patch_rails_cve_2013_0155

Fix for CVE-2013-0155
Update CHANGELOG for 1.2.19
Merge branch '1.2rc'

* 1.2rc:
  Update CHANGELOG for 1.2.19
  Fix for CVE-2013-0155
Merge pull request #163 from haus/add_helper_tasks_to_node

Add helper tasks to node namespace
Remove CHANGELOG file, update version link

This commit removes the CHANGELOG from the top level of Dashboard, which only
contains commit hashes/titles from the previous releases, and is of debateable
utility given the commits aren't particularly useful without git in which case
one could just do `git log`. Currently, the CHANGELOG file in the github repo
forms the target of the version link in the dashboard.  As such, this commit
also updates the dashboard version link to point at the github commit log up to
the version tag specified in VERSION. This allows us to bring the files that
have to be edited and commited to source prior to a Puppet Dashboard release
down to one.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Merge pull request #165 from MosesMendoza/maint/1.2rc/remove_changelog_file

Remove CHANGELOG file, update version link
Update VERSION for 1.2.20 release

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Merge branch '1.2rc'

* 1.2rc:
  Update VERSION for 1.2.20 release
  Remove CHANGELOG file, update version link
Merge branch 'master' into rails3

Conflicts:
	VERSION
	vendor/rails/activerecord/lib/active_record/base.rb
No longer required in Rails 3.