Add query_string as a variable for use in a rules file
Merge branch 'master' of git://github.com/plone/diazo into query-string-variable

Conflicts:
	docs/CHANGES.txt
Merge pull request #16 from plone/query-string-variable

Add query_string as a variable for use in a rules file