From 65ee075f32c58e35d3b660006bceaad9f6a2a4d8 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:48:33 -0500
Subject: [PATCH] Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable-3.1

---
 0 files changed, 0 insertions(+), 0 deletions(-)


--
Gitblit v1.9.1