Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Oct 2014 19:11:57 +0000 (20:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Oct 2014 19:11:57 +0000 (20:11 +0100)
commit57629914e8dd6559c163093312bd51adf677ddb7
tree5621bea3b330e15e07464aaaf703e22e7517373c
parent681c9bbe619ada94cc614719d276aa31397e2476
parentf2a7ec21e3abe4085ca113d7962bf60b150de7c6
Merge remote-tracking branch 'origin/seventeen' into seventeen

Conflicts:
make.sh