commit | 8aaf86a6ead9852631342d0d2d526a7eaede15cf | [log] [download] |
---|---|---|
author | Nicholas Marriott <nicholas.marriott@gmail.com> | Thu Oct 05 14:39:33 2017 +0100 |
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | Thu Oct 05 14:39:33 2017 +0100 |
tree | f3a32d85d8f6a43809ec6155bc3d65d8fa59f9a5 | |
parent | ff526e43de84cff3770d32c0b6ea215a7359f521 [diff] | |
parent | bd71cbbe276432ce8869baa0f2d55433e1ab820c [diff] |
Merge branch '2.6-rc'