diff tests/conftest.py @ 249:f1e8ed3ea141

Merge code changes.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 19 Feb 2015 23:35:31 -0800
parents 1cd67680c38c
children 76c838453dbe
line wrap: on
line diff