[MERGE] Latest trunk
authorMartin Trigaux <mat@openerp.com>
Wed, 3 Apr 2013 08:54:52 +0000 (10:54 +0200)
committerMartin Trigaux <mat@openerp.com>
Wed, 3 Apr 2013 08:54:52 +0000 (10:54 +0200)
bzr revid: mat@openerp.com-20130403085452-ds026f6xw1o1qq0c

1  2 
addons/mail/static/src/js/mail.js

Simple merge