Merge branch 'feature/update-about-sone' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 23 Jun 2015 04:45:57 +0000 (06:45 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 23 Jun 2015 04:45:57 +0000 (06:45 +0200)

Trivial merge