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)
commitd25b7c32bd420267d2604dfa34e6e3bfa7de9ed7
tree194ec6b6f86776baff088f9bad2c123c738360d3
parentdd58c50c3e55749903369c2b3258de7cc307c8ce
parent9eb6ff30db048dfeff384b53acc18e58b6363788
Merge remote-tracking branch 'glotzi/nut-update' into next