[libgphoto2/f20: 3/3] Merge branch 'f19' into f20

[Tim Waugh]

commit 533633bc434eab31f01e06ecb8159ac1e34661f3
Merge: 6e5843a ddab640
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Apr 11 13:11:08 2014 +0100

    Merge branch 'f19' into f20
    
    Conflicts:
    	libgphoto2.spec

 libgphoto2.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---