| commit | ccdea5004349d66f12c94f37e90cc205dd2ba8cd | [log] [tgz] |
|---|---|---|
| author | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:51:10 2017 -0700 |
| committer | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:51:10 2017 -0700 |
| tree | cce5707380a1dc6782055c06d9456a2d0df30c3f | |
| parent | 8a0a69dcbc2db6c51b2b5b327cf4fbd9c1fda050 [diff] | |
| parent | ff6a765facd65fb9fced817d88eb6f193436dcda [diff] |
Merge branch 'master' into 1.7.x