Merge branch 'sone-following-times' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 13 Nov 2011 18:52:48 +0000 (19:52 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 13 Nov 2011 18:52:51 +0000 (19:52 +0100)
This resolves #195.


Trivial merge