[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 23 Jan 2012 16:47:20 +0000 (17:47 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 23 Jan 2012 16:47:20 +0000 (17:47 +0100)
commit3c0218a2b8af43a895b956493caa951195483734
tree42d56aff72d166cab42b4b9c8eb839e8d03c2ea8
parent8bca78a89fd9784a7f4b8534b935c1a736651ebe
parent17ca711568bd7572a49c4f5ccc99fe0e80f72736
[MERGE]

bzr revid: nel@tinyerp.com-20120123164720-4rfa1srdelc55c3x