Merge remote-tracking branch 'alpha197/patch-1' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 May 2014 13:18:52 +0000 (15:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 May 2014 13:18:52 +0000 (15:18 +0200)
commitcf6abf539ed973c6bb053293cafeee01e60ac0d1
treee1ad8cea1dd390e4cc74dce346461b2ab6798482
parent080568824d60c86189a49d272a390f81c86a0eba
parentedb7235c38554f9a02a03cd1b58f027cae43cf8c
Merge remote-tracking branch 'alpha197/patch-1' into next