[MERGE] merge with main branch
authorMansi Kariya (OpenERP Trainee) <mansi.mk.179@gmail.com>
Wed, 21 Aug 2013 05:16:07 +0000 (10:46 +0530)
committerMansi Kariya (OpenERP Trainee) <mansi.mk.179@gmail.com>
Wed, 21 Aug 2013 05:16:07 +0000 (10:46 +0530)
commit264693820a94e029d35a585b764dcc037f7b16c9
treef5ee2e353ebb300c4e178700a42af06b28a1694f
parent4af5d29679589d6b79608b17ccdcf8735a060c6c
parentfb22df1f63e8450de458003bec51c0d1fb5d2696
[MERGE] merge with main branch

bzr revid: mansi.mk.179@gmail.com-20130821051607-t34od6nmfd5eiee1