[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.4-665-gf3e4cbd

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit f3e4cbd4ddf5083ed5f9f53a36f96e260ccd1d39
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Mar 1 07:47:22 2016 +0100

    Reorder to make diffing with git history easier.

diff --git a/debian/copyright b/debian/copyright
index c9bf8fa..d0dd8e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -190,15 +190,15 @@ Copyright:
  2011-2013, Darik Horn <dajhorn at vanadac.com>
 License: GPL-2+
 
-Files: debian/tree/zfsutils/usr/share/bash-completion/completions/zfs
-Copyright: 2010, Aneurin Price <aneurin.price at gmail.com>
-License: Expat
-
 Files: debian/po/*
 Copyright:
  2013, The Debian po file translators.
 License: CDDL-1.0
 
+Files: debian/tree/zfsutils/usr/share/bash-completion/completions/zfs
+Copyright: 2010, Aneurin Price <aneurin.price at gmail.com>
+License: Expat
+
 Files: include/libuutil_common.h
   include/zfs_fletcher.h
   include/zfs_prop.h

-- 
OpenZFS on Linux