[MERGE] opw 35939
authorolt@tinyerp.com <>
Thu, 24 Nov 2011 10:30:31 +0000 (11:30 +0100)
committerolt@tinyerp.com <>
Thu, 24 Nov 2011 10:30:31 +0000 (11:30 +0100)
commit5bb962c14cae18beba639e40a63616a3407a2904
tree132ed3d2b624a0d10633279aaea443964af94bd0
parentd18c6b69dabe27b1d76f91aaacbed9974299f9f5
parentc44aee1540015ce17cd74b2230216449e7cd1d94
[MERGE] opw 35939

bzr revid: olt@tinyerp.com-20111124103031-kzw29rqpl3owb5uw