[FIX] l10n_es: Some tax code names are too large.
[IMP] website: set geoip in user session
[FIX] website: geoip can't be none
merge upstream
[IMP] Display 'Direct inheritants' ir.ui.view form

This way, it's easier to create an inherited view 'on-the-fly' from the developer mode.
And it's even more handy if you want to inspect or modify an existing inherited view.
[IMP] Change tab name to keep it simple

As odony advised.
Merge pull request #623 from odoo-dev/master-website-session-geoip-chm

[IMP] website: set geoip in user session
[FIX] move back setup to root
[FIX] git config for pull
Merge pull request #607 from pedrobaeza/master

[FIX] l10n_es: Some tax code names get truncated due to the field size
Typo in server autoreload class
[FIX] setup missing file for windows nsi
Merge pull request #716 from sve-odoo/patch-5

[MERGE] ir.ui.view: display inherited views in form view
Merge branch 'master' of https://github.com/odoo/odoo into master-win32