Explain the use of links to display virtual fields in grids
Merge branch 'upstream'

Conflicts:
	sources/29-web2py-english/07.markmin