[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 31 Jan 2012 12:45:11 +0000 (13:45 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 31 Jan 2012 12:45:11 +0000 (13:45 +0100)
commita809791dc67fc66590a1caa3c1d31c335a208862
tree648c25e72c4033765386db54f2018d85a730f333
parent0e9f3609c4a23a83dfb23bee0a23a1676415cb0b
parentfdb78b1d6169eaff886a2a60882c20725bc9ec08
[MERGE]

bzr revid: nel@tinyerp.com-20120131124511-5ev3y9lx56ld8499