[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Mon, 22 Oct 2012 05:15:23 +0000 (10:45 +0530)
committerAmit Patel <apa@tinyerp.com>
Mon, 22 Oct 2012 05:15:23 +0000 (10:45 +0530)
commit6696825b5ef080592ef8f6f07157014dd20e9320
tree954e46fea1ac62bdb74133860b4631629e354566
parentdfc2ae47a809b945dfbe641a8b76b0156c47739d
parentf6722a220cbf2ca9ff3ed6ecf418e99b91522e06
[MERGE]:trunk

bzr revid: apa@tinyerp.com-20121017070937-52t28h5twjkj5rlr
bzr revid: apa@tinyerp.com-20121019062157-qxy9gw1b5d9siipp
bzr revid: apa@tinyerp.com-20121022051523-v89anrokk46jxmqb
addons/account/account_view.xml
addons/mail/mail_thread.py
addons/point_of_sale/static/src/css/pos.css