device-mgt-plugins/components
Dulitha Wijewantha 899662c5d5 Merge branch 'master' of github.com:wso2/product-mdm
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java
2015-01-23 19:07:21 +05:30
..
device-mgt Merge branch 'master' of github.com:wso2/product-mdm 2015-01-23 19:07:21 +05:30
key-mgt Changing cdm to mdm 2015-01-21 20:14:55 +05:30