| commit | 734c28b7450015f9d5a3f49ad04079424b6d6119 | [log] [tgz] |
|---|---|---|
| author | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:08:12 2017 -0700 |
| committer | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:08:12 2017 -0700 |
| tree | 1109790e9892311f7468b313f3aba827b39a27c5 | |
| parent | b8634afa45dbff16b6bd2babd23311e949ac3b0d [diff] | |
| parent | 04ce0ea5836400cfaf8298ea3323385591c66c74 [diff] |
Merge master --> 1.2.x