[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-mail-hr-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:12:33 +0000 (16:42 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:12:33 +0000 (16:42 +0530)
commit6d2c0ed8135cdcae0173705ff1a8f57c1959f77b
tree833e5ef0b7031ac482633c5c420f9def9e592731
parentdaef4a7eddd4c7d744cdd8ddbff8c3228a4d5d8b
parent89391773341d67a302feb316f9164b5fef9f74df
[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-mail-hr-tpa

bzr revid: jam@tinyerp.com-20120626111233-cjpal724c5ep36t6