annotate etc/photos/rickcm.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 33bdb3d4b97f
children eaf01113cd42
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
308
33bdb3d4b97f Import from CVS: tag r21-0b52
cvs
parents:
diff changeset
1 (binary:image/png)