[Merge] Merge from openerp-web.
authorJiten (OpenERP) <jra@tinyerp.com>
Fri, 7 Oct 2011 05:11:13 +0000 (10:41 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Fri, 7 Oct 2011 05:11:13 +0000 (10:41 +0530)
commit2adffb46e5952945f2b22197afab65b00b5d38cb
tree6cfe89b7666032e3540528c1e7d7aad6cdc32168
parente1e04341bc9c256701abcf1f1544d03f25bd5c50
parenta12c082d55dfdc759483e224b658180cc0151379
[Merge] Merge from openerp-web.

bzr revid: jra@tinyerp.com-20111007051113-w33l3jffcxlgz811