Merge branch 'fixes' into testing-uftesting-uf
commitc693239455afa5c48caf91841564aed5132f9192
authorFelix Salfelder <felix@salfelder.org>
Mon, 31 Oct 2016 10:35:02 +0000 (31 10:35 +0000)
committerFelix Salfelder <felix@salfelder.org>
Mon, 31 Oct 2016 10:35:02 +0000 (31 10:35 +0000)
tree8b049fa193ef2a6f35a86b68dd70db74ee75b52c
parent78c44631a6eb0f0affa4543a42c7aafa7e85c405
parent7f932e12708960c168b9763191fbebc663b594f4
Merge branch 'fixes' into testing-uf