[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 13:33:37 +0000 (14:33 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 13:33:37 +0000 (14:33 +0100)
commitefe8f4b47905c8f7841d5241dd4c98b3e26e1c9c
tree992e4a97a7382833a7862bb73b6b5e161726f186
parent5d428418b41baf5a9a22a8e68069f60016a78549
parentd76a49ac1cb476402f4ef89babc3477b4025983d
[MERGE]

bzr revid: nel@tinyerp.com-20120110133337-ku1ebqyzysez9jts