diff docs/upgrade.rst @ 3178:a64e663abda3 beta

fixed bad merge on git fetch fix
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 20 Jan 2013 23:17:45 +0100
parents 008d9c6f7c92
children f7a52d548fd0 8b8edfc25856
line wrap: on
line diff