Merge branch 'master' of github.com:flavour/web2py
Merge branch 'master' of git://github.com/web2py/web2py
Merge pull request #337 from spametki/master

Adapted admin cache action for gae
fixed issue 1836, Problem with IS_IN_DB(label='%(x)3.3s')
removed 'if count > limits[1]-limits[0]:' in dal.py
fixed problem about excutesql(as_dict=True) and ambiguous column names, thanks Anthony
fixed error message, thanks Anthony
fixed a problem with python version compatibility, thanks Anthony
fixed routes.parametric.example.py, thanks Jonathan
fix issue 1840
Merge pull request #338 from timrichardson/issue/1840

fix issue 1840, CAS failing due to redirect loop
rearranged markmin.html
fixed grid export in HTML
Merge branch 'master' of git://github.com/web2py/web2py
Fix for orderby_on_limitby with Table aliases
Merge pull request #339 from flavour/master

Fix for orderby_on_limitby with Table aliases
fixed LazyCrypt.__ne__, thanks Jonathan
fixed login_bare uses registration_key without .strip() for boolean testing which causes failure, thanks Remco
fixed 1845:styling widget divs, thanks Paolo Caruccio
fixed 1843, commented functions should not appear as if they are exposed