[MERGE]
authorNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 15:45:40 +0000 (16:45 +0100)
committerNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 15:45:40 +0000 (16:45 +0100)
commit7204814145f0076bc51720646c442e4b2c4c46a0
tree726ad13f0bfbd0f1c29679e2fcecb6823f9ee3a1
parentc15902dec9525bbe1268a452d862b246fe62a4b0
parent6cd3d85524c94ed5be6c0dd5f250ae0e8483dd4f
[MERGE]

bzr revid: nel@tinyerp.com-20120308154540-d61jutyp9gbk14lq