tree d96a4d635fd6788661ef3c0a7acd8e31f225c540
parent 308fae21725368afc202a8e7826c8e6b83d9710d
author Max Klyus <xmaruto@gmail.com> 1462355236 -0700
committer Max Klyus <xmaruto@gmail.com> 1462355236 -0700

merged final changes