diff etc/photos/jamesm.png @ 5508:3fe8358ad59a

Merge, restoring Ben's GPLv3 manual changes.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 09 May 2011 20:47:31 +0100
parents 5dad2072e5f0
children 3742ea8250b5
line wrap: on
line diff