tree 5fcb3e53329b3b1bcea3721975294dd30ff1a871
parent de183f5102889ece7bcaba2ce7d3584a99201a36
parent 51a5cb6d5fc832ae0fb1fc9ecccc2387ae017ea6
author Danny van Bruggen <lol@meuk.info> 1468407355 +0200
committer GitHub <noreply@github.com> 1468407355 +0200

Merge branch 'master' into minor_cleanups