Merge branch 'master' into dbus

diff --cc configure.in
Simple merge

diff --cc snapper.spec.in
index b0a7140ee3c7f534128db9c1c7a6410d8525439c,3e45e424075125b518705ca808ca8613ee2a950c..7a921ae75c4fdb149078253f859dfbc2c895d80f
--- 1/snapper.spec.in
--- 2/snapper.spec.in
+++ b/snapper.spec.in
@@@ -27,13 -27,9 +27,10 @@@ Patch1:             no-readonly.dif
  Prefix:               /usr
  BuildRequires:        boost-devel doxygen gcc-c++ libtool libxml2-devel
  BuildRequires:        python-devel swig
- %if 0%{?suse_version}
- BuildRequires:        libblocxx-devel
- %if 0%{?suse_version} >= 1210
 +BuildRequires:  dbus-1-devel
+ %if (0%{?suse_version} && 0%{?suse_version} >= 1210)
  BuildRequires:        libzypp(plugin:commit)
  %endif
- %endif
  Requires:     libsnapper@LIBVERSION_MAJOR@ = %version
  %if 0%{?suse_version}
  Recommends:   cron logrotate snapper-zypp-plugin

diff --cc snapper/Makefile.am
Simple merge