Menaka Jayawardena 5d41fe313b Merge branch 'backend-integration' ... # Conflicts: # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java # modules/integration/tests-integration/src/test/resources/automation.xml # modules/integration/tests-integration/src/test/resources/testng.xml		2017-01-25 15:50:43 +05:30
..
test	Merge branch 'backend-integration'	2017-01-25 15:50:43 +05:30