Merge branch 'master' into og-autoload

Conflicts:
	Netdisco/share/config.yml
This commit is contained in:
Oliver Gorwits
2014-07-01 21:50:01 +01:00
60 changed files with 124 additions and 70 deletions

View File

@@ -4,7 +4,7 @@ use strict;
use warnings;
use 5.010_000;
our $VERSION = '2.027007';
our $VERSION = '2.028000';
use App::Netdisco::Configuration;
use Module::Find ();