[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 20 Feb 2012 11:58:04 +0000 (12:58 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 20 Feb 2012 11:58:04 +0000 (12:58 +0100)
commit60741aa908bab2d873d11e71d99f4cb8b309c891
treee4b457069e9b630d5f18d7062739877a2bf5dcba
parentace41bb1750a409283023de0536cb4b2d72035f0
parenta45344e7be4dd40236be6362398210587a740d73
[MERGE]

bzr revid: nel@tinyerp.com-20120220115804-e2dw9nq60r0gbchg