From: Alkorin <github@alkorin.fr>
Date: Wed, 5 Oct 2016 18:00:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=ngadmin

Merge remote-tracking branch 'upstream/master'
---

5bf8650ce6d465b8cb1e570548819f0cefe9a87d