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

[Christof Damian]

commit 01325baccf8daa189eaf80409de35f5c8a8bb1f3
Merge: a04b1a1 26d68f8
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 26 16:18:27 2013 +0200

    Merge branch 'master' into f19

 sphinx.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---