[libusbmuxd/f21: 5/5] Merge branch 'master' into f21

[Rex Dieter]

commit 8314cee10cee468aed2bed390ebd0976fad69d65
Merge: ecddfc1 323c09e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 9 20:38:58 2014 -0500

    Merge branch 'master' into f21

 libusbmuxd.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---