aliencube/MOKA-CMS — pull request #5 by Patricklee1014 (2013-09-16 15:44:59+00:00)
Title: Request for Pull Request

Sorry for the late request.

Added XML file and fixed conflict error. I guess the issue is introduced since pulling process is executed on uncommitted codes and pulling codes was required to merge with local codes. Need to be more clear the reason on Wednesday :)