[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 30 Jan 2012 12:29:36 +0000 (13:29 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 30 Jan 2012 12:29:36 +0000 (13:29 +0100)
commit621ff634e75dcbaecb32182412c9b0edeb3c4192
tree47ac34039a2e7fc621337de65982832bf55da9da
parent5ff3a65ed7e049766676e8dcbf442d166dc7b5a0
parent5abd0e4c4db5e8fbd86019310526c9ae05a78754
[MERGE]

bzr revid: nel@tinyerp.com-20120130122936-bnf530hdi8bf1hjp