annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2368
5dad2072e5f0 [xemacs-hg @ 2004-11-05 19:29:42 by youngs]
youngs
parents: 2367
diff changeset
1 (binary:image/png)