Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Nov 2014 17:36:31 +0000 (18:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Nov 2014 17:36:31 +0000 (18:36 +0100)
commita5c99abe185bb8429149f4eadc1ce8244d3f6130
treedc018e08ec566745b1718e95fcf2aa12b2a763d9
parent8f6e429843317243f412486813533c610c186673
parentb154ded15d18987dfad297ee1ea7a07feb87bab6
Merge remote-tracking branch 'origin/seventeen' into seventeen