[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 18 Jul 2011 15:29:54 +0000 (17:29 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 18 Jul 2011 15:29:54 +0000 (17:29 +0200)
commitda5f320a0a72c0fa4bcf2a415556f469104402da
tree1a9debd7b7c2d204fa0c17774a7a6152fd9405de
parent193fc86c38fb2a3241e16b6afcc79627f4c1886a
parent711b22f52cb4876509abbdc029dd6a1303b474f9
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20110718152954-1osrwsxmyij4wkun
addons/base/static/src/js/data.js
addons/base/static/src/js/form.js