diff docs/changelog.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 48a18391f6da
children cd50d1b5f35b 54bea1081508
line wrap: on
line diff