| commit | a76d36d94d1f676d95358959cd2c864d8e0a2313 | [log] [tgz] |
|---|---|---|
| author | Olaf Otto <olaf@x100.de> | Thu Apr 28 15:58:48 2016 +0200 |
| committer | Olaf Otto <olaf@x100.de> | Thu Apr 28 15:58:48 2016 +0200 |
| tree | c823fd94b6e54592565d7b3bcdb9166586b814be | |
| parent | a717f4bc3231daf79b8ea3b743144b0f9f3d6945 [diff] | |
| parent | 5be88c37254b495c6ce7f0d83d04e7767d362eb7 [diff] |
Merge branch 'release-2.x' into build