diff etc/photos/chrm.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 851ff35f137f
children eaf01113cd42
line wrap: on
line diff