Merge branch 'drupal-generic' of gitmaster.atlas.aei.uni-hannover.de:einsteinathome/drupal-boinc into drupal-generic

drupal/sites/all/features/global_search_solr/global_search_solr.apachesolr_environments.inc

@@ -84,6 +84,8 @@ function global_search_solr_apachesolr_environments() {
       3 => 'panel',
       4 => 'profile',
       5 => 'story',
+      6 => 'team',
+      7 => 'team_forum',
     ),
   );
   $export['solr'] = $environment;