[usbmuxd/f18: 2/2] Merge branch 'master' into f18

[Peter Robinson]

commit 7f3610f139bbb2af63c545b442417ba6ca567492
Merge: d9b2754 2768306
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Oct 16 22:45:08 2013 +0100

    Merge branch 'master' into f18

 usbmuxd.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---