Merge remote-tracking branch 'upstream/SLE-12-SP1-GA' into rollback_only_root_master

diff --cc VERSION
index 1866a362b7bef6cc0e128e9d3f846fdb6b179858,639ede3c05abd195d7a82e82ea803915b8d4040b..13dead7ebf1a32bd34586224763a32f1aa790b96
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 0.2.9
 -0.2.9.1
++0.2.10

diff --cc package/snapper.changes
index 16bae799332666e61af12c4ac56fa4bd6918638a,d106960a87257bc956e8775840be1c7ac5e956f0..d0b8e1c47d7a679c7b67cb4834e8b682d8cb20a8
--- 1/package/snapper.changes
--- 2/package/snapper.changes
+++ b/package/snapper.changes
@@@ -1,8 -1,8 +1,14 @@@
 -- version 0.2.9.1
+ -------------------------------------------------------------------
+ Mon Dec 14 16:25:32 UTC 2015 - lslezak@suse.cz
+ 
+ - Allow rollback only for the root file system (bsc#954445)
++- version 0.2.10
++
 +-------------------------------------------------------------------
 +Wed Oct 14 13:52:10 CEST 2015 - aschnell@suse.com
 +
 +- added conditional compilation of installation-helper
 +  (gh#openSUSE/snapper#202)
  
  -------------------------------------------------------------------
  Tue Sep 22 16:51:23 CEST 2015 - aschnell@suse.com