From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 30 Nov 2015 16:36:10 +0000 (+0100)
Subject: Merge branch 'master' of git.onelab.eu:/git/nodeconfig
X-Git-Url: http://git.onelab.eu/?p=nodeconfig.git;a=commitdiff_plain;h=HEAD

Merge branch 'master' of git.onelab.eu:/git/nodeconfig
---

5632c42d3c1771de410dc5c775d12f83c3da9eac