comparison docs/conf.py @ 3967:33e36ad0a61e

merged dev into stable
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Jun 2013 20:58:03 +0200
parents aa90719e8520
children 7e5f8c12a3fc
comparison
equal deleted inserted replaced
3965:5aa571d559bf 3967:33e36ad0a61e