Merge branch 'master' into og-autoload

Conflicts:
	Netdisco/share/public/javascripts/netdisco_portcontrol.js
This commit is contained in:
Oliver Gorwits
2014-07-31 21:32:30 +01:00
12 changed files with 124 additions and 48 deletions

View File

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