tree fa8b752e8ae45fdeb41f0657694a3921cd290da9
parent 6a3e6a3af1ae843b838350d18f7a37fdeb178b0b
parent fce61236cfc29b44e04f4bd27088c94df5f99ede
author filmaj <maj.fil@gmail.com> 1493324237 -0700
committer filmaj <maj.fil@gmail.com> 1493324237 -0700

Merge branch 'master' into 1.1.x