[tigervnc/f22: 2/2] Merge branch 'f21' into f22

[Tim Waugh]

commit 88736550ffa0eaf217b031371abdee21ec725048
Merge: 1b3794d 092df3f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Mar 6 09:23:56 2015 +0000

    Merge branch 'f21' into f22

 tigervnc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---