From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 22 Sep 2015 13:23:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.3.3~58^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F198%2Fhead;p=thirdparty%2Fsnapper.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	package/snapper.changes
---

f5842a508496587f571f95640737bcb9f26e0a01
diff --cc package/snapper.changes
index a755329c,57417623..f38ab7c2
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@@ -1,9 -1,10 +1,17 @@@
  -------------------------------------------------------------------
+ Tue Sep 22 14:55:10 CEST 2015 - shundhammer@suse.de
+ 
+ - Call script /usr/lib/snapper/plugins/rollback if present upon
+   rollback (fate#319108)
+ - version 0.2.9
+ 
++-------------------------------------------------------------------
++
 +Tue Sep 22 12:20:28 CEST 2015 - aschnell@suse.com
 +
 +- added program to create btrfs subvolume suitable for systems
 +  supporting rollback (bsc#944120)
 +
  -------------------------------------------------------------------
  Mon Aug 31 16:26:51 CEST 2015 - aschnell@suse.com