[MERGE]Trunk.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 20 Dec 2013 07:34:14 +0000 (13:04 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 20 Dec 2013 07:34:14 +0000 (13:04 +0530)
commitf12a8e94ac0fc74b80babaac6f04adc5d55178b4
treea23f30ed86e63ec97bc86ca82bb38fa818c3316f
parent5e5483bde4bb6329aab389f68f09121426e43312
parent1e3ebc028544f5e5c85191168630b3e11106e286
[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20131220073414-spf39j62hv7btxt9
addons/web/static/src/js/chrome.js
addons/web/static/src/js/views.js
addons/web_kanban/static/src/js/kanban.js