From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 17 Feb 2012 20:38:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/nss-reworked'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b24088d312b943f082c450227d7231a66d8dc559;hp=-c;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/nss-reworked'
---

b24088d312b943f082c450227d7231a66d8dc559