| commit | bef6211b437c00cd09c5ce0280ff383f665f761a | [log] [tgz] |
|---|---|---|
| author | filmaj <maj.fil@gmail.com> | Thu Apr 27 13:04:10 2017 -0700 |
| committer | filmaj <maj.fil@gmail.com> | Thu Apr 27 13:04:10 2017 -0700 |
| tree | 95c9353325911d45422411c106a1d15fae354516 | |
| parent | 99a1ff0687585d373e24c36dc32f424daed024da [diff] | |
| parent | 710b53d24b360597646da8d353e1031fbfe7b4b9 [diff] |
Merge branch 'master' into 1.3.x