[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 14:42:15 +0000 (15:42 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 14:42:15 +0000 (15:42 +0100)
bzr revid: nel@tinyerp.com-20120110144215-khh30rp9tn1bmbim

1  2 
addons/account/account_move_line.py

Simple merge