[gramps/f21: 4/4] Merge branch 'master' into f21

[Jon Ciesla]

commit c1d597b063767f4e1d7489d9d9bb4f8694f3e534
Merge: da432d5 08b09c1
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Nov 3 09:47:24 2014 -0600

    Merge branch 'master' into f21
    
    Conflicts:
    	gramps.spec

 .gitignore  |    1 +
 gramps.spec |   40 ++++++++++++++++++++--------------------
 sources     |    2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)
---