From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Mar 2013 21:19:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/sssd'
X-Git-Tag: pango~249
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd6f1960d84a3b1f34828abf966f96496d8f04c7;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/sssd'
---

cd6f1960d84a3b1f34828abf966f96496d8f04c7