annotate etc/photos/jamesm.png @ 5375:2fba45e5b48d

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 17 Mar 2011 20:17:19 +0000
parents b42a3c0d709e
children eaf01113cd42
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5131
b42a3c0d709e fix permissions, fix Jerry's photos
Ben Wing <ben@xemacs.org>
parents: 5117
diff changeset
1 (binary:image/png)