tree 36ef723b38e0c17720a7622ec04ce6112343d732
parent baab98a02c786531eef821c48a28cbd6e92e1be1
parent 273e5a674ec25e3f01a8c3992fa25c16f0f66065
author filmaj <maj.fil@gmail.com> 1493322578 -0700
committer filmaj <maj.fil@gmail.com> 1493322578 -0700

Merge branch 'master' into 1.0.x