author | Sebastian Harl <sh@tokkee.org> | |
Fri, 21 Aug 2015 12:14:10 +0000 (14:14 +0200) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Fri, 21 Aug 2015 12:14:10 +0000 (14:14 +0200) | ||
commit | 9e9a8d617a8b29c6bc8700885e2cd15d8b71e8f1 | |
tree | 7fdec11b274e511ae639d5550b81a306a83d85e2 | tree | snapshot |
parent | 546a6028cba5a9e237f01dc08a8734c3f5f4ba56 | commit | diff |
parent | 1cf67d3e29da8ce7bdb29bc2fb8b1f0c1ca96e39 | commit | diff |
Merge tag 'upstream/5.5.0'
Upstream version 5.5.0
Upstream version 5.5.0