reduced memory footprint by conditionally loading Tk
customization of upload package input in admin interface
fixed issue topic/web2py/LGxJR85pG88, thanks Oliver
fixed issue 1586:MSSQL Date format is language dependent, thanks score2000
Merge pull request #135 from carpaIdea/master

customization of upload package input in admin interface
fixed bug in recent commit, thanks Olivier Johner
fixed problem with tempfiles in Android, thanks Fernando Pacheco
optimizations. Switch to PyCrypto support in pbkdf2 when possible.
Merge pull request #136 from michele-comitini/speed_triks1

optimizations. Switch to PyCrypto support in pbkdf2 when possible.
fixed issue 1587:Mongodb error on id
fix issue 1592
fixed a problem in recent commit when pycrypto is missing, the fix is temporary
Merge pull request #138 from niphlod/issue/1592

fix issue 1592
Merge branch 'master' of github.com:web2py/web2py
removed pycrypto leaving only strxor for speeding up pbkdf2
files toggle in admin, maybe as Massimo would want it
fixed conflict
Merge pull request #140 from carpaIdea/master

files toggle in admin, maybe as Massimo would want it
fix for postgresql when using an alias.
admin - site page - small visual enhancements