wnd-charm/wnd-charm — pull request #40 by igg (2014-12-04 00:13:24+00:00)
Title: Merge Chris's and IGG's changes upstream

This is just to propagate Chris's changes upstream