[MERGE] Merge team3 branch=>
authorMustufa Rangwala <mra@mra-laptop>
Tue, 6 Jul 2010 09:28:36 +0000 (14:58 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 6 Jul 2010 09:28:36 +0000 (14:58 +0530)
commit7705fb3fa40eab9bf48f33a8b473cc833f1b410f
treec31d6bddfb8f63c47d374c9bb6ee2ecaa93c88e0
parent177bd4c707a49a2f430a56f9b686229196075111
parent75e5e9334540c2104a39d1f4c9d1ca2386b20638
[MERGE] Merge team3 branch=>
[ADD] hr_payroll: added yaml, get back payroll module changes reverted by merging from addons
[REF] stock

bzr revid: mra@mra-laptop-20100706092836-vmc7dk3yco0l53xf