Merge branch 'sudo-without-pam' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 May 2014 21:46:20 +0000 (23:46 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 May 2014 21:46:20 +0000 (23:46 +0200)

Trivial merge