diff tests/conftest.py @ 87:2fb6501ed668

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 03 Sep 2014 18:49:10 -0700
parents 1cd67680c38c
children 76c838453dbe
line wrap: on
line diff