cesanta/v7 — pull request #37 by cpq (2014-12-11 10:17:16+00:00)
Title: Cosmetic changes + styling.

Fixed merging garbage