device-mgt-core/components
manoj 505b87a655 Merge remote-tracking branch 'upstream/master'
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
2015-01-27 23:20:49 +05:30
..
device-mgt Merge remote-tracking branch 'upstream/master' 2015-01-27 23:20:49 +05:30
key-mgt Changing the version to 1.0.0 2015-01-21 20:14:04 +05:30
policy-mgt Changing the version to 1.0.0 2015-01-21 20:14:04 +05:30