[MERGE]
authorNajlaâ <nel@tinyerp.com>
Wed, 18 Jan 2012 15:52:47 +0000 (16:52 +0100)
committerNajlaâ <nel@tinyerp.com>
Wed, 18 Jan 2012 15:52:47 +0000 (16:52 +0100)
commitb1082d33ffb446a46db78742496f5b8bcfc11a32
tree07a52eaa3e4abd6e683d5c59afc3e8a0148c051e
parent09764f38cabeb882d81da4a3bfb98d56c5225b36
parent7a2b96b424cd41a8dda5e18cc3c2d98bbd1cc444
[MERGE]

bzr revid: nel@tinyerp.com-20120118155247-j8cevhn1hlpq78jq