[rubygem-dynect_rest/f19: 5/5] Merge branch 'master' into f19

[Russell Harrison]

commit 53e68788a3abe260bac043e9ceadd18d436d3136
Merge: 02efba3 8d94567
Author: Russell Harrison <rharrison at fedoraproject.org>
Date:   Fri Aug 30 16:42:41 2013 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	rubygem-dynect_rest.spec

 rubygem-dynect_rest.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---