[bind: 3/3] Merge branch 'master' into f21

[Tomas Hozza]

commit 0cc3dc9157079bda7416a6ce73bf1447fba2710a
Merge: 68221b2 55b0a6b
Author: Tomas Hozza <thozza at redhat.com>
Date:   Fri Jul 18 13:36:08 2014 +0200

    Merge branch 'master' into f21

 bind.spec                |    5 ++++-
 named-chroot.service     |    3 ++-
 named-sdb-chroot.service |    3 ++-
 named-sdb.service        |    3 ++-
 named.service            |    3 ++-
 5 files changed, 12 insertions(+), 5 deletions(-)
---