[sphinx/epel7: 4/4] Merge branch 'master' into epel7

[Sam Kottler]

commit 4103f9a9030d08e276785a533574e1c15785b507
Merge: 01325ba 09af004
Author: Sam Kottler <shk at redhat.com>
Date:   Mon Jan 27 15:25:43 2014 +0100

    Merge branch 'master' into epel7
    
    * master:
      2.1.5
      Fix build with systemd, Cleanup and modernise spec
      upstream 2.1.2

 .gitignore  |    4 +---
 sources     |    2 +-
 sphinx.spec |   34 +++++++++++++++-------------------
 3 files changed, 17 insertions(+), 23 deletions(-)
---