tree 5f501404b0e33ddf7116fd989f8359856b8a114a
parent 131f75f04d08137bf5d8e67cfab1aa8d8b8480ae
parent 7af309f316f69835cd1c8b806d4edbcbdab9128d
author filmaj <maj.fil@gmail.com> 1493320576 -0700
committer filmaj <maj.fil@gmail.com> 1493320576 -0700

Merge branch 'master' into 1.0.x