Merge branch 'master' into e133-hacks
Merge branch 'master' of github.com:OpenLightingProject/ola
Merge branch 'master' into e133-hacks
Fix two comment typos
Merge branch 'master' of github.com:nomis52/ola
Merge branch 'master' of github.com:OpenLightingProject/ola
Attempt to conver to a non-recursive make build.
Couple of fixes to the non-recursive make build.
More cleanup, the build completes now.
Get the build and test stages to pass.
Work towards getting the Python tests running again.
Add back the Python tests that were removed.
I think this should get the build working again.
Try to get distcheck to pass
And some more fixes
Maybe this will fix the build.
Build file cleanup, change tests to test_programs
Merge branch 'nr-make' of github.com:nomis52/ola
Merge branch 'master' into e133-hacks

Conflicts:
	tools/e133/Makefile.am
Merge branch 'e133-hacks' of github.com:nomis52/ola into e133-hacks