[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 13 Feb 2012 16:21:45 +0000 (17:21 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 13 Feb 2012 16:21:45 +0000 (17:21 +0100)
commit6438b7d794cd037583be5595f1b857dada9329fd
treeddfddc058ac6830be9680ad9dac54d48d0ae2c84
parent8e0efe168a0bd62a689d063891a1a002f9674817
parent9ddb2be6b296bbe8730fbc915ef5924ee878fa71
[MERGE]

bzr revid: nel@tinyerp.com-20120213162145-j91bf9xk76202gvr