[MERGE]
authorNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 13:19:20 +0000 (14:19 +0100)
committerNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 13:19:20 +0000 (14:19 +0100)
commit7389983a73eb6364eb3b88456c140b0553a26203
treeae184c3f454b1a748ea0e8453c94784877704741
parent6ca70e09c38dfd3bf3d963d3a6e2b40bf1c2ff19
parent0e6e577d91524b40fd4c8dc58817a948b4ef1518
[MERGE]

bzr revid: nel@tinyerp.com-20120308131920-fz8fiv7irad06nvo