[perl-BerkeleyDB: 2/2] Merge branch 'master' into f20

[Paul Howarth]

commit 5369452dfd48b61449d3998b1c2b1e8c525c92f4
Merge: d584b7d c863867
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Nov 10 20:00:41 2013 +0000

    Merge branch 'master' into f20
    
    Conflicts:
    	perl-BerkeleyDB.spec

 perl-BerkeleyDB.spec |    8 ++++++--
 sources              |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
---