cesanta/v7 — pull request #26 by mmikulicic (2014-12-09 11:56:08+00:00)
Title: Revert "Cosmetic changes + styling."

Reverts cesanta/v7#23

Contained merge conflict marks