[Merge] Merged with main addons
authorMansi Kariya (OpenERP Trainee) <mansi.mk.179@gmail.com>
Mon, 12 Aug 2013 09:14:43 +0000 (14:44 +0530)
committerMansi Kariya (OpenERP Trainee) <mansi.mk.179@gmail.com>
Mon, 12 Aug 2013 09:14:43 +0000 (14:44 +0530)
bzr revid: mansi.mk.179@gmail.com-20130812091443-xn1p6tvotr435163


Trivial merge