Merge branch 'master' of https://github.com/adefaria/clearscm

diff --cc clearadm/lib/Clearadm.pm
index 1f74aaf,afda2ae..a9bcb36
--- 1/clearadm/lib/Clearadm.pm
--- 2/clearadm/lib/Clearadm.pm
+++ b/clearadm/lib/Clearadm.pm
@@@ -680,12 -700,9 +680,17 @@@ sub GetVob($$) 
    } # if
  } # GetVob
  
++<<<<<<< HEAD
 +sub FindVobStorage(;$$) {
 +  my ($self, $tag, $region) = @_;
 +
 +  $tag    ||= '';
 +  $region ||= '';
 +
++=======
+ sub FindVob($;$) {
+   my ($self, $tag, $region) = @_;
+ 
    # Windows vob tags begin with "\", which is problematic. The solution is to
    # escape the "\"
    $tag =~ s/^\\/\\\\/;