still on licensing

37 files changed, 251 insertions, 81 deletions

diff --git a/OWNERS.rst b/OWNERS.rst
new file mode 100644
index 00000000..a5ba3525
--- /dev/null
+++ b/OWNERS.rst
@@ -0,0 +1,63 @@
+------
+Owners
+------
+
+The following list mentions the owner for each source file in this
+project
+
+* src/lib/merchant_api_context.c:   GNUnet e.V. and INRIA
+* src/lib/merchant_api_context.h:   GNUnet e.V. and INRIA
+* src/lib/merchant_api_pay.c:   GNUnet e.V. and INRIA
+* src/lib/merchant_api_json.h:   GNUnet e.V. and INRIA
+* src/lib/test_merchant_api.c:   GNUnet e.V. and INRIA
+* src/lib/merchant_api_json.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_parsing.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_responses.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_parsing.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_responses.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_util.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_util.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_mhd.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_contract.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_exchanges.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_contract.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_auditors.h:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_mhd.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_exchanges.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_pay.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_auditors.c:   GNUnet e.V. and INRIA
+* src/backend/taler-merchant-httpd_pay.h:   GNUnet e.V. and INRIA
+* src/include/platform.h:   GNUnet e.V. and INRIA
+* src/include/taler_merchantdb_lib.h:   GNUnet e.V. and INRIA
+* src/include/taler_merchant_service.h:   GNUnet e.V. and INRIA
+* src/include/taler_merchantdb_plugin.h:   GNUnet e.V. and INRIA
+* src/tests/test_contract.c:   GNUnet e.V. and INRIA
+* src/backenddb/merchantdb_plugin.c:   GNUnet e.V. and INRIA
+* src/backenddb/plugin_merchantdb_postgres.c:   GNUnet e.V. and INRIA
+* copylib/config.php:   INRIA
+* copylib/merchants.php:   INRIA
+* copylib/util.php:   INRIA
+* examples/shop/config.php:   INRIA
+* examples/shop/fulfillment.php:   INRIA
+* examples/shop/pay.php:   INRIA
+* examples/shop/index.php:   INRIA
+* examples/shop/generate_taler_contract.php:   INRIA
+* examples/shop/checkout.php:   INRIA
+* examples/blog/essay_fulfillment.php:   INRIA
+* examples/blog/essay_pay.php:   INRIA
+* examples/blog/blog_lib.php:   INRIA
+* examples/blog/essay_cc-fulfillment.php:   INRIA
+* examples/blog/essay_contract.php:   INRIA
+* examples/blog/taler-presence.js:   INRIA
+* examples/blog/index.html:   INRIA
+* examples/blog/essay_cc-form.html:   INRIA
+* examples/shop/style.css:   INRIA
+* examples/blog/style.css:   INRIA
+* NOTE: the copyright for content in examples/blog/articles is owned by the Free Software Foundation
+
+--------------------
+Runtime dependencies
+--------------------
+TDB
diff --git a/examples/blog/blog_lib.php b/examples/blog/blog_lib.php
index d7e6c513..b7781f7b 100644
--- a/examples/blog/blog_lib.php
+++ b/examples/blog/blog_lib.php
@@ -1,4 +1,20 @@
 <?php
+/*
+  This file is part of GNU TALER.
+  Copyright (C) 2014, 2015 INRIA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+*/
+
   /**
    * Take a (article's) filename and return its
    * teaser. It has the articles folder hardcoded
diff --git a/examples/blog/essay_cc-form.html b/examples/blog/essay_cc-form.html
index 7e0c04ed..f115e51b 100644
--- a/examples/blog/essay_cc-form.html
+++ b/examples/blog/essay_cc-form.html
@@ -1,3 +1,19 @@
+<!DOCTYPE html>
+<!-- 
+  This file is part of GNU TALER.
+  Copyright (C) 2014, 2015 INRIA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+-->
 <html>
   <head>
     <link rel="stylesheet" type="text/css" href="style.css">
diff --git a/examples/blog/essay_cc-fulfillment.php b/examples/blog/essay_cc-fulfillment.php
index 5890c03d..4239ee97 100644
--- a/examples/blog/essay_cc-fulfillment.php
+++ b/examples/blog/essay_cc-fulfillment.php
@@ -1,4 +1,20 @@
 <?php
+/*
+  This file is part of GNU TALER.
+  Copyright (C) 2014, 2015 INRIA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+*/
+
   include '../../copylib/util.php';
   include './blog_lib.php';
 
diff --git a/examples/blog/essay_contract.php b/examples/blog/essay_contract.php
index 6482a3b4..a63d82c9 100644
--- a/examples/blog/essay_contract.php
+++ b/examples/blog/essay_contract.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This file is part of GNU TALER.
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Lesser General Public License as published by the Free Software
diff --git a/examples/blog/essay_fulfillment.php b/examples/blog/essay_fulfillment.php
index 088735d9..1f2eb18e 100644
--- a/examples/blog/essay_fulfillment.php
+++ b/examples/blog/essay_fulfillment.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This file is part of GNU TALER.
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Lesser General Public License as published by the Free Software
diff --git a/examples/blog/essay_pay.php b/examples/blog/essay_pay.php
index 3ad28ceb..66fe8ffc 100644
--- a/examples/blog/essay_pay.php
+++ b/examples/blog/essay_pay.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This file is part of GNU TALER.
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Lesser General Public License as published by the Free Software
diff --git a/examples/blog/index.html b/examples/blog/index.html
index a91a67b0..25535bde 100644
--- a/examples/blog/index.html
+++ b/examples/blog/index.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!-- 
+  This file is part of GNU TALER.
+  Copyright (C) 2014, 2015 INRIA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+-->
 <html lang="en">
 <head>
   <title>Richard M. Stallman: Free Software, Free Society</title>
diff --git a/examples/blog/style.css b/examples/blog/style.css
index 20373e00..6e087cc8 100644
--- a/examples/blog/style.css
+++ b/examples/blog/style.css
@@ -1,3 +1,26 @@
+/*
+    This file is part of TALER
+    Copyright (C) 2014,2015 INRIA
+
+    TALER is free software: you can
+    redistribute it and/or modify it under the terms of the GNU
+    Lesser General Public License (GNU LGPL) as published by the
+    Free Software
+    Foundation, either version 3 of the License, or (at your option)
+    any later version.  The code is distributed WITHOUT ANY WARRANTY;
+    without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU LGPL for more details.
+
+    As additional permission under GNU LGPL version 3 section 7, you
+    may distribute non-source (e.g., minimized or compacted) forms of
+    that code without the copy of the GNU LGPL normally required by
+    section 4, provided you include this license notice and a URL
+    through which recipients can access the Corresponding Source.
+
+    @licend  The above is the entire license notice
+    for the JavaScript code in this page.
+ */
+
 body {
     background-color: white;
     margin: 0;
diff --git a/examples/blog/taler-presence.js b/examples/blog/taler-presence.js
index 2562238b..9028f5e2 100644
--- a/examples/blog/taler-presence.js
+++ b/examples/blog/taler-presence.js
@@ -1,7 +1,7 @@
 /* @licstart  The following is the entire license notice for the
   JavaScript code in this page.
 
-  Copyright (C) 2016 GNUnet e.V.
+  Copyright (C) 2016 INRIA
 
   The JavaScript code in this page is free software: you can
   redistribute it and/or modify it under the terms of the GNU
diff --git a/examples/shop/checkout.php b/examples/shop/checkout.php
index 58de2e8a..2efcf276 100644
--- a/examples/shop/checkout.php
+++ b/examples/shop/checkout.php
@@ -1,49 +1,31 @@
 <!DOCTYPE html>
+<!--
+  This file is aprt of GNU TALER
+  Copyright (C) 2014,2015 INRIA
+
+  TALER is free software: you can
+  redistribute it and/or modify it under the terms of the GNU
+  Lesser General Public License (GNU LGPL) as published by the
+  Free Software
+  Foundation, either version 3 of the License, or (at your option)
+  any later version.  The code is distributed WITHOUT ANY WARRANTY;
+  without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU LGPL for more details.
+
+  As additional permission under GNU LGPL version 3 section 7, you
+  may distribute non-source (e.g., minimized or compacted) forms of
+  that code without the copy of the GNU LGPL normally required by
+  section 4, provided you include this license notice and a URL
+  through which recipients can access the Corresponding Source.
+
+-->
 <html>
 <head>
   <title>Toy Store - Payment method - Taler Demo</title>
   <link rel="stylesheet" type="text/css" href="style.css">
-  <script>
-      /*
-      @licstart  The following is the entire license notice for the
-      JavaScript code in this page.
-
-      Copyright (C) 2014,2015 GNUnet e.V.
-
-      The JavaScript code in this page is free software: you can
-      redistribute it and/or modify it under the terms of the GNU
-      Lesser General Public License (GNU LGPL) as published by the
-      Free Software
-      Foundation, either version 3 of the License, or (at your option)
-      any later version.  The code is distributed WITHOUT ANY WARRANTY;
-      without even the implied warranty of MERCHANTABILITY or FITNESS
-      FOR A PARTICULAR PURPOSE.  See the GNU LGPL for more details.
-
-      As additional permission under GNU LGPL version 3 section 7, you
-      may distribute non-source (e.g., minimized or compacted) forms of
-      that code without the copy of the GNU LGPL normally required by
-      section 4, provided you include this license notice and a URL
-      through which recipients can access the Corresponding Source.
-
-      @licend  The above is the entire license notice
-      for the JavaScript code in this page.
-      */
-  </script>
   <script type="application/javascript" src="web-common/taler-presence.js"></script>
 </head>
 <body>
-<!--
-  This main goal of this page is to show to the customer all the accepted
-  payments methods and actually implementing just Taler; technically
-  the steps are:
-
-  1. retrieve the information about the donation from the
-     form and remember it in a PHP session
-  2. show a menu with all the required payments system options,
-     only showing "Taler" if the wallet is present
-  3. (JavaScript) implement the "checkout" button for Taler,
-     for the demo we ignore the other payment options.
--->
 
 <?php
   // get the donation information from form
diff --git a/examples/shop/config.php b/examples/shop/config.php
index 1680a9b5..89b7b0bc 100644
--- a/examples/shop/config.php
+++ b/examples/shop/config.php
@@ -1,4 +1,5 @@
 <?php
+/* This file is in the public domain */
 
 $host = $_SERVER["HTTP_HOST"];
 
diff --git a/examples/shop/fulfillment.php b/examples/shop/fulfillment.php
index b06f2bd7..6fe2f96e 100644
--- a/examples/shop/fulfillment.php
+++ b/examples/shop/fulfillment.php
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!-- 
+  This file is part of GNU TALER.
+  Copyright (C) 2014, 2015 INRIA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+-->
 <html lang="en">
 <head>
   <title>Taler's "Demo" Shop</title>
@@ -41,21 +56,6 @@
   <section id="main">
     <article>
 <?php
-/*
-  This file is part of GNU TALER.
-  Copyright (C) 2014, 2015 GNUnet e.V.
-
-  TALER is free software; you can redistribute it and/or modify it under the
-  terms of the GNU Lesser General Public License as published by the Free Software
-  Foundation; either version 2.1, or (at your option) any later version.
-
-  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License along with
-  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
- */
 
 include '../../copylib/util.php';
 
diff --git a/examples/shop/generate_taler_contract.php b/examples/shop/generate_taler_contract.php
index 213632b3..4198b40d 100644
--- a/examples/shop/generate_taler_contract.php
+++ b/examples/shop/generate_taler_contract.php
@@ -1,7 +1,7 @@
 <?php 
 /*
   This file is part of GNU TALER.
-  Copyright (C) 2014-2016 GNUnet e.V.
+  Copyright (C) 2014-2016 INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Lesser General Public License as published by the Free Software
diff --git a/examples/shop/index.php b/examples/shop/index.php
index 90b17ed4..239fa425 100644
--- a/examples/shop/index.php
+++ b/examples/shop/index.php
@@ -1,4 +1,20 @@
 <!DOCTYPE html>
+<!DOCTYPE html>
+<!-- 
+  This file is part of GNU TALER.
+  Copyright (C) 2014, 2015 INRIA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free Software
+  Foundation; either version 2.1, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+-->
 <?php
 require_once "../../copylib/config.php";
 ?>
diff --git a/examples/shop/pay.php b/examples/shop/pay.php
index cd95714e..0684e495 100644
--- a/examples/shop/pay.php
+++ b/examples/shop/pay.php
@@ -1,7 +1,7 @@
 <?php 
 /*
   This file is part of GNU TALER.
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Lesser General Public License as published by the Free Software
diff --git a/examples/shop/style.css b/examples/shop/style.css
index c2cc51ee..dd6bc6e8 100644
--- a/examples/shop/style.css
+++ b/examples/shop/style.css
@@ -1,3 +1,25 @@
+/*
+    This file is part of TALER
+    Copyright (C) 2014,2015 INRIA
+
+    TALER is free software: you can
+    redistribute it and/or modify it under the terms of the GNU
+    Lesser General Public License (GNU LGPL) as published by the
+    Free Software
+    Foundation, either version 3 of the License, or (at your option)
+    any later version.  The code is distributed WITHOUT ANY WARRANTY;
+    without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU LGPL for more details.
+
+    As additional permission under GNU LGPL version 3 section 7, you
+    may distribute non-source (e.g., minimized or compacted) forms of
+    that code without the copy of the GNU LGPL normally required by
+    section 4, provided you include this license notice and a URL
+    through which recipients can access the Corresponding Source.
+
+    @licend  The above is the entire license notice
+    for the JavaScript code in this page.
+ */
 body {
     background-color: white;
     margin: 0;
@@ -119,5 +141,3 @@ h4, h5, h6 {
     transform: rotate(360deg);
   }
 }
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d26b2c8..55f6a82b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,3 @@
+# This Makefile is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 SUBDIRS = include backenddb backend
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
index 14ac2ad9..1f8d7e54 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -350,7 +350,6 @@ parse_wireformat_test (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (NULL == j_wire)
     return GNUNET_SYSERR;
   return GNUNET_OK;
-
 }
 
 
@@ -545,6 +544,7 @@ run (void *cls,
 {
   char *wireformat;
 
+  wireformat = NULL;
   result = GNUNET_SYSERR;
   shutdown_task =
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
@@ -627,6 +627,7 @@ run (void *cls,
  EXITIF_exit:
   if (GNUNET_OK != result)
     GNUNET_SCHEDULER_shutdown ();
+  GNUNET_free_non_null (wireformat);
   GNUNET_free_non_null (keyfile);
   if (GNUNET_OK != result)
     GNUNET_SCHEDULER_shutdown ();
diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h
index f64bb099..6804f842 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_auditors.c b/src/backend/taler-merchant-httpd_auditors.c
index e479f8b6..ca993928 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_auditors.h b/src/backend/taler-merchant-httpd_auditors.h
index e71b4964..57e0ff51 100644
--- a/src/backend/taler-merchant-httpd_auditors.h
+++ b/src/backend/taler-merchant-httpd_auditors.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c
index 28431df7..a2b893b9 100644
--- a/src/backend/taler-merchant-httpd_contract.c
+++ b/src/backend/taler-merchant-httpd_contract.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_contract.h b/src/backend/taler-merchant-httpd_contract.h
index 88c12805..92f0aa99 100644
--- a/src/backend/taler-merchant-httpd_contract.h
+++ b/src/backend/taler-merchant-httpd_contract.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
index 59e97495..2ca95aee 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA 
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_exchanges.h b/src/backend/taler-merchant-httpd_exchanges.h
index 6612f4f4..868ff0cf 100644
--- a/src/backend/taler-merchant-httpd_exchanges.h
+++ b/src/backend/taler-merchant-httpd_exchanges.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_mhd.c b/src/backend/taler-merchant-httpd_mhd.c
index 9ffabe4d..eddb447f 100644
--- a/src/backend/taler-merchant-httpd_mhd.c
+++ b/src/backend/taler-merchant-httpd_mhd.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_mhd.h b/src/backend/taler-merchant-httpd_mhd.h
index 48d210a1..fdfb81db 100644
--- a/src/backend/taler-merchant-httpd_mhd.h
+++ b/src/backend/taler-merchant-httpd_mhd.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
index 4c12ea6c..cc467837 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015, 2016 GNUnet e.V.
+  (C) 2014, 2015, 2016 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backend/taler-merchant-httpd_util.c b/src/backend/taler-merchant-httpd_util.c
index 4fa6ab82..0a8237f3 100644
--- a/src/backend/taler-merchant-httpd_util.c
+++ b/src/backend/taler-merchant-httpd_util.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backenddb/merchantdb_plugin.c b/src/backenddb/merchantdb_plugin.c
index 52d0dd1f..16758fd1 100644
--- a/src/backenddb/merchantdb_plugin.c
+++ b/src/backenddb/merchantdb_plugin.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015 GNUnet e.V.
+  Copyright (C) 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index c9e504fa..74be6a9c 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/include/platform.h b/src/include/platform.h
index 6e4baec6..f62299b5 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014 Chrisitan Grothoff (and other contributing authors)
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index e3b26ee8..22760dd5 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
diff --git a/src/include/taler_merchantdb_lib.h b/src/include/taler_merchantdb_lib.h
index 93cb4656..bb5bb9d3 100644
--- a/src/include/taler_merchantdb_lib.h
+++ b/src/include/taler_merchantdb_lib.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 959b2a2c..693417b4 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
diff --git a/src/tests/test_contract.c b/src/tests/test_contract.c
index f48ed613..17b6106a 100644
--- a/src/tests/test_contract.c
+++ b/src/tests/test_contract.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software