summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-09-23 07:51:52 +0200
committerGeorg Brandl <georg@python.org>2014-09-23 07:51:52 +0200
commitbd577dae35fb9208ecf10a1b0244ca085ca9b3ad (patch)
tree15fc7739b7129ec9eb5ed53352dfadaed5fcefa3
parent238af1d9b8f6fe10bd33679a1d3f2099f54ca7a1 (diff)
parentb8cc1d161f92a5fac3a2b9110bc1cb5eddf07031 (diff)
downloadsphinx-bd577dae35fb9208ecf10a1b0244ca085ca9b3ad.tar.gz
merge heads
0 files changed, 0 insertions, 0 deletions