User: taniwha Branch: HEAD Date: Thu, 07 Oct 2010 04:24:49 +0000 Modified files: /modules/flickrrippr flickrrippr.module Log message: removed conflict markers from merge from D6 Links: http://cvs.drupal.org/diff.php?path=contributions/modules/flickrrippr/flickr...