Merge branch 'master' into og-pluggable-daemon

Conflicts:
	Netdisco/lib/App/Netdisco.pm
This commit is contained in:
Oliver Gorwits
2014-05-17 22:20:40 +01:00
5 changed files with 11 additions and 5 deletions

View File

@@ -4,7 +4,7 @@ use strict;
use warnings;
use 5.010_000;
our $VERSION = '2.027003';
our $VERSION = '2.027004';
use App::Netdisco::Configuration;
=head1 NAME