giacomo final
Merge branch 'master' of https://github.com/giacogiac/bug-marmelade.git

Conflicts:
	mistergooddeal/derby.log