[MERGE]
authorNajlaâ <nel@tinyerp.com>
Wed, 8 Feb 2012 10:20:15 +0000 (11:20 +0100)
committerNajlaâ <nel@tinyerp.com>
Wed, 8 Feb 2012 10:20:15 +0000 (11:20 +0100)
commit8e02f68a4c192de3261fbcc1eb96c1e138e7276f
treeda75db9b12a644e7d96054381181b6beeb5f6c48
parenta47afe0c618bd9c7fcb37eb0ffe034287fc00754
parent9ec3a4b9e1d350703c0d622bd910364aa3d1465b
[MERGE]

bzr revid: nel@tinyerp.com-20120208102015-mazyri2jrpjk0g19