Merge pull request #1516 from bk138/ola-0.9.6
authorSteven Barth <steven@midlink.org>
Fri, 3 Jul 2015 05:23:15 +0000 (07:23 +0200)
committerSteven Barth <steven@midlink.org>
Fri, 3 Jul 2015 05:23:15 +0000 (07:23 +0200)
ola: Update to 0.9.6, tidy up makefile, try to resolve build dependencies


Trivial merge