Merge tag 'upstream/0.23.1'

Upstream version 0.23.1

12 files changed, 13 insertions, 13 deletions

diff --git a/plugins/shotwell-data-imports/FSpotDatabase.vala b/plugins/shotwell-data-imports/FSpotDatabase.vala
index 7003ae6..979171c 100644
--- a/plugins/shotwell-data-imports/FSpotDatabase.vala
+++ b/plugins/shotwell-data-imports/FSpotDatabase.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
index c8d8324..6d669b3 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
+++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
index 3c7744f..f2bcdc9 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
+++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotImporter.vala b/plugins/shotwell-data-imports/FSpotImporter.vala
index 593f456..bd408cc 100644
--- a/plugins/shotwell-data-imports/FSpotImporter.vala
+++ b/plugins/shotwell-data-imports/FSpotImporter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -31,7 +31,7 @@ public class FSpotService : Object, Spit.Pluggable, Spit.DataImports.Service {
 
     public void get_info(ref Spit.PluggableInfo info) {
         info.authors = "Bruno Girin";
-        info.copyright = _("Copyright 2009-2015 Yorba Foundation");
+        info.copyright = _("Copyright 2016 Software Freedom Conservancy Inc.");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.vala b/plugins/shotwell-data-imports/FSpotMetaTable.vala
index 2e58379..264fe85 100644
--- a/plugins/shotwell-data-imports/FSpotMetaTable.vala
+++ b/plugins/shotwell-data-imports/FSpotMetaTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
index b5897cb..d4e8202 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
index 9df0600..35b913b 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.vala b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
index 5ef0751..fdf4c00 100644
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.vala b/plugins/shotwell-data-imports/FSpotRollsTable.vala
index 6924762..850b47f 100644
--- a/plugins/shotwell-data-imports/FSpotRollsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotRollsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.vala b/plugins/shotwell-data-imports/FSpotTableBehavior.vala
index a0b003f..0922912 100644
--- a/plugins/shotwell-data-imports/FSpotTableBehavior.vala
+++ b/plugins/shotwell-data-imports/FSpotTableBehavior.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.vala b/plugins/shotwell-data-imports/FSpotTagsTable.vala
index e846eb5..8ac9807 100644
--- a/plugins/shotwell-data-imports/FSpotTagsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotTagsTable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.vala b/plugins/shotwell-data-imports/shotwell-data-imports.vala
index 8a16aaa..78dace0 100644
--- a/plugins/shotwell-data-imports/shotwell-data-imports.vala
+++ b/plugins/shotwell-data-imports/shotwell-data-imports.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.