fixed 1756:scripts/sessions2trash.py doesn't work with 'separate=True', thanks Paolo Valleri
fixed 1765:Verify email message seams to only accept username, key and link
fixed colgroup issue in grid, thanks Anthony
fixed 1746:auth.wiki renders multi-line code as single-line, thanks Alan
Merge branch 'master' of github.com:web2py/web2py

Conflicts:
	VERSION