X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;fp=merge.c;h=9dcbf4d20fc3c784df361cb68e6c6a2d8ec5dac2;hb=5e1b22d763640c4d7a09d07920403d8d491b4410;hp=118e757737796871352c9ce2a2b421a2b5c19850;hpb=0211c730256c9bbaf10a569c88f7df0ef882311e;p=onak.git

diff --git a/merge.c b/merge.c
index 118e757..9dcbf4d 100644
--- a/merge.c
+++ b/merge.c
@@ -1,9 +1,20 @@
 /*
  * merge.c - Routines to merge OpenPGP public keys.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007,2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2005 Project Purple
+ * This program 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 Foundation; version 2 of the License.
+ *
+ * This program 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <stdio.h>