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)
commitbb34588a1b7a80a2a98574d9b928f1131ab88a79
tree92140e65da1c477ed0aebc1a708eb3fc25b602f7
parente4ae59234c87e77f95714462adae370790c6d5e6
parentf720183b01cc2f677358986cd165a0fd26a45a43
Merge branch 'sone-following-times' into next

This resolves #195.