changelog
Merge branch 'master' of github.com:fransschreuder/usbpicprog

Conflicts:
	trunk/upp_wx/debian/changelog
Added support for 12F1840, thanks to PhotoKevin