User: paulbooker Branch: HEAD Date: Sat, 25 Sep 2010 21:26:37 +0000 Modified files: /modules/flickr README.txt /modules/flickr/block flickr_block.module /modules/flickr/field flickrfield.module /modules/flickr/filter flickr_filter.module /modules/flickr flickr.admin.inc flickr.api.inc flickr.css flickr.inc flickr.info flickr.install flickr.module /modules/flickr/sets flickr_sets.module Log message: Merging the development branch back into HEAD Links: http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/README.txt&... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/block/flick... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/field/flick... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/filter/flic... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.admi... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.api.... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.css&... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.inc&... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.info... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.inst... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/flickr.modu... http://cvs.drupal.org/diff.php?path=contributions/modules/flickr/sets/flickr...