From: Alkorin <github@alkorin.fr>
Date: Wed, 4 Mar 2015 14:07:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=180d6f7fefe979e3404ea803d9a3fed9c51fb610;p=ngadmin

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

180d6f7fefe979e3404ea803d9a3fed9c51fb610