Merge branch 'feature/fix-logging' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 04:38:13 +0000 (06:38 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 04:38:13 +0000 (06:38 +0200)
commit32998f6979928e57b9b7a4eac4dabe668a821471
tree5fca14ff4e01dea4cf4536e82790cf77f0132f1a
parent7af9716bb6b142aebac32c9117c6cc54c73867d0
parent3a7092e48f27cba6286946442783f539ad73a911
Merge branch 'feature/fix-logging' into next