From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 16 Apr 2013 14:55:49 +0000 (+0200)
Subject: Merge branch 'xattrs' of https://github.com/oniko/ok-snap into oniko-xattrs
X-Git-Tag: v0.1.3~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ca81a2f78ee0087dd3a6c71dba1af417adafe0e;p=thirdparty%2Fsnapper.git

Merge branch 'xattrs' of https://github.com/oniko/ok-snap into oniko-xattrs
---

7ca81a2f78ee0087dd3a6c71dba1af417adafe0e
diff --cc VERSION
index d917d3e2,d917d3e2..b1e80bb2
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
--0.1.2
++0.1.3
diff --cc package/snapper.changes
index 54223858,406f098c..479a4106
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@@ -1,8 -1,3 +1,14 @@@
++-------------------------------------------------------------------
++Tue Apr 16 16:52:29 CEST 2013 - aschnell@suse.de
++
++- merged xattr support from oniko
++- 0.1.3
++
 +-------------------------------------------------------------------
 +Thu Feb 28 18:39:19 CET 2013 - aschnell@suse.de
 +
 +- added filters for lvm
 +
  -------------------------------------------------------------------
  Mon Feb 25 10:54:32 CET 2013 - aschnell@suse.de
  
diff --cc testsuite-real/.gitignore
index b1d5fd08,b1d5fd08..34910597
--- a/testsuite-real/.gitignore
+++ b/testsuite-real/.gitignore
@@@ -11,3 -11,3 +11,5 @@@ error
  error2
  error3
  error4
++xattrs1
++xattrs2