[perl-Crypt-Rijndael/epel7: 5/5] Merge branch 'master' into epel7

[Matías Kreder]

commit 91bf016ab96753cd806d00f33bb5a10de2a42c72
Merge: db8e452 85c6227
Author: Matias Kreder <mkreder at gmail.com>
Date:   Sun Nov 16 16:02:21 2014 -0300

    Merge branch 'master' into epel7
    
    Conflicts:
    	perl-Crypt-Rijndael.spec

 .gitignore               |    1 +
 perl-Crypt-Rijndael.spec |   14 ++++++++++----
 sources                  |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---