[avahi/f21: 4/4] Merge branch 'master' into f21

[Peter Lemenkov]

commit edd5d76011c7b53cbf695523f06747893a3c9e01
Merge: 3b04c7e c517f0a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Nov 27 13:49:47 2014 +0300

    Merge branch 'master' into f21
    
    Conflicts:
    	avahi.spec

 avahi.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---