[MERGE] Merged with main branch
authorMansi Kariya (OpenERP Trainee) <mansi.mk.179@gmail.com>
Thu, 29 Aug 2013 12:33:07 +0000 (18:03 +0530)
committerMansi Kariya (OpenERP Trainee) <mansi.mk.179@gmail.com>
Thu, 29 Aug 2013 12:33:07 +0000 (18:03 +0530)
commite92eb160af61e87f659ea1d97a5a3f3664416aa2
treec4ef3742df4649b9831f5114d8a62cad2abc6194
parentf8e800cc0e087cbe52cfe50636039b64a4ba200e
parent00d3d9a4b6ee444e68b2db28f0726192a686a411
[MERGE] Merged with main branch

bzr revid: mansi.mk.179@gmail.com-20130829123307-q4dl81sd3ekb01e4