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

[Darryl L. Pierce]

commit 60cffb2a231610eaa6d35454cdf746c8ba8be85a
Merge: bfb2fbd 1bd5054
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Tue Jun 10 09:38:01 2014 -0400

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	rubygem-foreigner.spec
    	sources

 .gitignore             |    1 +
 rubygem-foreigner.spec |   21 +++++++++------------
 sources                |    2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)
---