Merge branch 'relative-timestamps-150' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 14 Apr 2011 18:26:35 +0000 (20:26 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 14 Apr 2011 18:26:35 +0000 (20:26 +0200)
commitac926296e54cb3387e5772fceda9fa20b25d6711
treead724925431b7b97935d4083de8b8808db988b73
parent99202fc71976dda021446626a0147431e419299e
parent403bcebd8de71dcb793c3f15138bc2df6431ae06
Merge branch 'relative-timestamps-150' into next

This fixes #150.