[IMP] view and resolve conflict
authorRGA(OpenERP) <>
Tue, 17 Jul 2012 10:26:34 +0000 (15:56 +0530)
committerRGA(OpenERP) <>
Tue, 17 Jul 2012 10:26:34 +0000 (15:56 +0530)
commitb6f1b50b34e1474ff3838f65b85472f39fd7e2ee
treedb7186ac3c781dcd73544681530811525ca8d6e9
parentc574671aa2c2d2080402538b204b05ae606f4ae9
[IMP] view and resolve conflict

bzr revid: rgaopenerp-20120717102634-qklib4p9j6lwahyx
addons/account/static/src/css/account.css
addons/account/static/src/js/account.js