manoj d0603f3e0b Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: product/modules/p2-profile-gen/pom.xml		2015-01-14 18:42:47 +05:30
..
client	changes in local notification	2015-01-06 18:59:10 +05:30
jax-rs	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-14 18:42:47 +05:30