device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.common
Dilshan Edirisuriya 3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
2015-08-21 14:53:36 +05:30
..
src/main/java/org/wso2/carbon/device/mgt/common Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-21 14:53:36 +05:30
pom.xml [maven-release-plugin] prepare for next development iteration 2015-02-24 14:29:34 +05:30