annotate etc/photos/james.png @ 4500:c86a3c1b7416

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 20 Aug 2008 17:36:27 +0200
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)