Merge branch 'master' into timeheap
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 31 Dec 2016 17:53:33 +0000 (18:53 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 31 Dec 2016 18:24:30 +0000 (19:24 +0100)
commitbcad6b0c48d516ddc920b52f06083ceaa242e1ca
tree8a4c06586a8de346bce3bd11fd269d0f99ee92d8
parent589987f8218c9aa61d65f582a3b3e1bbd32bda81
parent4b70e201af5bcc4926ab9b877592ba210b32ccdc
Merge branch 'master' into timeheap

Conflicts:
lib/mtio-epoll.c
lib/mtio-epoll.c