manoj d790d343a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java		2015-03-20 12:32:50 +05:30
..
device-mgt	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-20 12:32:50 +05:30
key-mgt	CDMF-6 fix	2015-02-10 18:28:18 +05:30
policy-mgt	Seperating the dao to Feature, profile, policy and adding the exeception for each ones	2015-03-18 14:00:21 +05:30
user-mgt	Email management	2015-03-20 12:27:45 +05:30