Merge remote-tracking branch 'origin/feature/windll'
authorpavel <pavel@aaa>
Fri, 16 Jan 2015 23:18:28 +0000 (01:18 +0200)
committerpavel <pavel@aaa>
Fri, 16 Jan 2015 23:18:28 +0000 (01:18 +0200)

Trivial merge