Merge branch 'thingos'

This commit is contained in:
Calin Crisan 2017-07-07 23:07:00 +03:00
commit 7eee00c30d