diff tests/test-simplemerge.py @ 11550:14e90cc3a296

merge with stable
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 13 Jul 2010 22:56:01 +0900
parents e433002acb05
children 7de7630053cb
line wrap: on
line diff