[MERGE] sync with latest trunk
authorOlivier Dony <odo@openerp.com>
Mon, 6 Feb 2012 15:33:00 +0000 (16:33 +0100)
committerOlivier Dony <odo@openerp.com>
Mon, 6 Feb 2012 15:33:00 +0000 (16:33 +0100)
commit2e8f622f453185f1b6aa90345eb7b23de923dbc9
tree4419c5922642bf98d63cbf2ae58207ce6f4c4e83
parent968decea96874e708bf95d63d65dadf159936074
parent5f7d98ef2535f4d9dd39a5cea1ddb25774f81480
[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20120206153300-ql0qo3mf0j4x05n9
addons/web/controllers/main.py
addons/web_gantt/i18n/da.po
addons/web_graph/i18n/da.po