Changes to be committed:
	modified:   blocks/gpacal/block_gpacal.php
	new file:   blocks/gpacal/block_gpacal.php~
	modified:   blocks/gpacal/version.php
	new file:   blocks/gpacal/version.php~