[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Thu, 22 Nov 2012 05:10:32 +0000 (10:40 +0530)
committerAmit Patel <apa@tinyerp.com>
Thu, 22 Nov 2012 05:10:32 +0000 (10:40 +0530)
commitb17dc2122d417675ce23c5f032b3a9b244984bcb
tree20f87f38d3c499a2e57361f16edc340a47a0e98c
parentaa0404b509de45b68b5dce9eb75a10d261f69f1f
parentc0df907c29d37cef45b9955190c5ac8bcb5f9c2f
[MERGE]:trunk

bzr revid: apa@tinyerp.com-20121122051032-wpk2r3a12v5jyknb
addons/account/account_invoice.py
addons/mail/static/src/js/mail_followers.js
addons/sale/sale.py