KSP-CKAN/CKAN — pull request #545 by RichardLake (2014-12-10 06:28:30+00:00)
Title: Gui conflict display

Closes #500.
Built on #498 so that should be merged first.