commit | 999f464ec79a9a54f59bfeff21728d0bba6e857a | [log] [tgz] |
---|---|---|
author | Joan Touzet <joant@atypical.net> | Sun Feb 18 12:30:55 2018 -0500 |
committer | Joan Touzet <joant@atypical.net> | Sun Feb 18 12:30:55 2018 -0500 |
tree | 02f10ddd56b8757b40091956c286119b0855273a | |
parent | cb521b34cfdd38f2ff833efbd8af4dc208ee599e [diff] | |
parent | 0ab4804d52abeba02eefcebbc39ac4b92cf0e5fe [diff] |
Merge branch 'upstream-2.17.0'