User: yogadex Branch: HEAD Date: Tue, 03 Aug 2010 23:02:47 +0000 Modified files: /modules/fb fb.module fb.theme.inc fb_connect.js fb_stream.module Log message: latest changes drupal.org cvs, resolved conflict Links: http://cvs.drupal.org/diff.php?path=contributions/modules/fb/fb.module&old=1... http://cvs.drupal.org/diff.php?path=contributions/modules/fb/fb.theme.inc&ol... http://cvs.drupal.org/diff.php?path=contributions/modules/fb/fb_connect.js&o... http://cvs.drupal.org/diff.php?path=contributions/modules/fb/fb_stream.modul...