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

[Russell Harrison]

commit 1dee75c6fa207203bed31c60df9a9313527f7303
Merge: 778902c 8d94567
Author: Russell Harrison <rharrison at fedoraproject.org>
Date:   Fri Aug 30 16:31:06 2013 -0400

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

 rubygem-dynect_rest.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---