[dhcp: 11/11] Merge branch 'f21'

[Jiří Popelka]

commit e70cc7073272899aebe19fd74973f8923a1c0505
Merge: 0bccfbc 4992026
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Aug 26 12:08:58 2014 +0200

    Merge branch 'f21'

 dhclient-script |   15 ++++++++-------
 dhcp.spec       |    5 ++++-
 2 files changed, 12 insertions(+), 8 deletions(-)
---