Merge remote-tracking branch 'upstream/master'

Conflicts:
	package/snapper.changes

diff --cc package/snapper.changes
index a755329c7eb69dd2601c228465f43f7be8b4cc66,574176235bb7217b7202e581a35c92bcb2eeba5b..f38ab7c24c0f3e3f6a6600f739484768118c2bba
--- 1/package/snapper.changes
--- 2/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