User: taniwha Branch: DRUPAL-7--1 Date: Fri, 03 Sep 2010 03:52:21 +0000 Modified files: /modules/flickrrippr flickrrippr.inc Log message: removed merge conflict marker Links: http://cvs.drupal.org/diff.php?path=contributions/modules/flickrrippr/flickr...