tree 0ace0bbcab226a109897872ba0ffae409de9cd41
parent a1ac2296d711416037d8aade9fa0d2117a15c321
parent 34cccf6b027bb328a92fbbdb89b9861634b22d12
author filmaj <maj.fil@gmail.com> 1493321862 -0700
committer filmaj <maj.fil@gmail.com> 1493321862 -0700

Merge branch 'master' into 1.3.x