commit | 19f561726e62ae700bd3370d72295c12ec5ac484 | [log] [tgz] |
---|---|---|
author | Gezapeti Cseh <gezapeti@gmail.com> | Tue May 23 18:21:20 2017 +0200 |
committer | Gezapeti Cseh <gezapeti@gmail.com> | Tue May 23 18:42:17 2017 +0200 |
tree | 755a9a8d3793a97f0288560fa57b2f64a1fb0970 | |
parent | 523ec74e30ad4c03095acb86cd48eb761a3b493c [diff] | |
parent | 53b1d1e4392cfd35d10860e3b1437273d909a316 [diff] |
Merge branch 'master' into oya