Alfreds Master to dev#813

Merged

alfreb merged 2 commits intoincludeos:devfrom

Sep 5, 2016

Commits on Sep 5, 2016

test: increased dhcp timeout for dhcp test. Some times necessary when running tests in parallell
alfreb
committed
Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS
alfreb
committed