[sphinx/f20: 2/2] Merge branch 'master' into f20

[Christof Damian]

commit 3cf74dd5a7732f42eb953bff2652982f9806a75e
Merge: 26d68f8 a062bc0
Author: Christof Damian <christof at damian.net>
Date:   Sat Nov 2 15:18:46 2013 +0100

    Merge branch 'master' into f20

 .gitignore  |    1 +
 sources     |    2 +-
 sphinx.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---