comparison docs/conf.py @ 1232:0dc8d578ff49

merges for stable
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 09 Apr 2011 18:38:18 +0200
parents b3ec9f4af18b
children 6b97fb00fa03
comparison
equal deleted inserted replaced
1231:9f6560667743 1232:0dc8d578ff49