Merge tag 'upstream/3.3.3'

[debian/amanda] / xfer-src / xmsg.c

diff --git a/xfer-src/xmsg.c b/xfer-src/xmsg.c
index ef3820e15c773c5ea252192aad466aa8d2df232e..30b78cb6ebe8dc1407d9a80798bcf5df0aeb19c9 100644 (file)
--- a/xfer-src/xmsg.c
+++ b/xfer-src/xmsg.c
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -18,8 +19,8 @@
  * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
  */
 
-#include "amxfer.h"
 #include "amanda.h"
+#include "amxfer.h"
 
 /* TODO: use glib chunk allocator */