[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 23 Jan 2012 15:32:20 +0000 (16:32 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 23 Jan 2012 15:32:20 +0000 (16:32 +0100)
commit8bca78a89fd9784a7f4b8534b935c1a736651ebe
treea45393782b4dcc9fa91bfdb784518aaa90ecf673
parentc52795d66e51056aae3f8b2a6fc952f410e5ec03
parent0b3ad6fa24a9922ece322ceb130ba901ae5324a0
[MERGE]

bzr revid: nel@tinyerp.com-20120123153220-jtd9pshhxnmcz7ww