Merge branch 'master' of ssh://server/scm/spider

Conflicts:
	Changes
	data/cty.dat
	data/prefix_data.pl

diff --combined Changes
index b9671d0abe1993ab27312c9f65777ba7a4103176,d8095e76e6ec7bafb070e718f2d6279f4150b463..211463698baccb6cc65ebc65ae33ce0ad0eff408
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,5 -1,5 +1,7 @@@
- 02Oct11=======================================================================
++04Nov11=======================================================================
 +1. Add CTY2115 changes
+ 20Oct11=======================================================================
+ 1. Add CTY2113 Changes
  02Oct11=======================================================================
  1. change 40m bandplan after some input from Martin, ik2rmz
  2. Add CTY2112 changes

diff --combined perl/Version.pm
index d32b17230eb5797cdb6209c15d31e2c27c631585,d32b17230eb5797cdb6209c15d31e2c27c631585..985314d568e7361a1e0084f8db7ea3d3cb58f7ca
--- 1/perl/Version.pm
--- 2/perl/Version.pm
+++ b/perl/Version.pm
@@@ -11,7 -11,7 +11,7 @@@ use vars qw($version $subversion $buil
  
  $version = '1.55';
  $subversion = '0';
--$build = '94';
--$gitversion = '6262a02';
++$build = '95';
++$gitversion = '9bbfe9a';
  
  1;