From: Alkorin <github@alkorin.fr>
Date: Wed, 10 Sep 2014 06:37:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.sur5r.net/?p=ngadmin;a=commitdiff_plain;h=f1820d27fcc160825c093a6e2e4fe2c39f269303

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/src/session.c
---

f1820d27fcc160825c093a6e2e4fe2c39f269303