commit | 7edb4f072d8e05f0422dde54d9c4244b3cc9e32f | [log] [tgz] |
---|---|---|
author | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:16:16 2017 -0700 |
committer | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:16:16 2017 -0700 |
tree | 5f501404b0e33ddf7116fd989f8359856b8a114a | |
parent | 131f75f04d08137bf5d8e67cfab1aa8d8b8480ae [diff] | |
parent | 7af309f316f69835cd1c8b806d4edbcbdab9128d [diff] |
Merge branch 'master' into 1.0.x