Merge remote-tracking branch 'glotzi/nut-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 May 2014 11:49:12 +0000 (13:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 May 2014 11:49:12 +0000 (13:49 +0200)

Trivial merge