[fedora-packager/f19: 2/2] Merge branch 'master' into f19

[Dennis Gilmore]

commit 33ecd228e67193fcdeefd170bcd50943b162759c
Merge: 44d178d 7ff5e49
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Sun Nov 23 23:39:27 2014 -0600

    Merge branch 'master' into f19

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---