[kdnssd/f20] (10 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  968e4bb... 4.12.90 (*)
  628061d... zeroconf-ioslave-4.12.95 (*)
  9440a16... 4.12.97 (*)
  20c067c... 4.13.0 (*)
  7bafc76... 4.13.1 (*)
  a2c7afd... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  1286230... 4.13.2 (*)
  7203a7f... Revert "zerconf-iosloave-4.12.5"
  c170219... Revert "zeroconf-ioslave-4.12.4"
  01de031... Merge branch 'master' into f20

(*) This commit already existed in another branch; no separate mail sent