[MERGE] merged with main server branch
authorBharat R. Devnani (OpenERP) <bde@tinyerp.com>
Fri, 18 Apr 2014 06:10:57 +0000 (11:40 +0530)
committerBharat R. Devnani (OpenERP) <bde@tinyerp.com>
Fri, 18 Apr 2014 06:10:57 +0000 (11:40 +0530)
commita684b9a96afa51d90f5e1ea35bbe65496280e4cb
tree36d27507996ca50459933d44356bf609f9094567
parentb0c17397df7b3255a4bc9e500c9837f9fc82696e
parent37bf72aca522cbce90a8bff3c53eef9db24c7eb2
[MERGE] merged with main server branch

bzr revid: bde@tinyerp.com-20140418061057-r33mkw0xqmmmk5ff