annotate etc/photos/martin.png @ 5726:179f4a9201b5

Merge.
author Mike Sperber <sperber@deinprogramm.de>
date Tue, 05 Mar 2013 08:55:56 +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)