wso2-dev/carbon-registry — pull request #6 by cnapagoda (2014-05-30 08:12:33+00:00)
Title: Resolve conflicts

Resolve conflicts in registry