Merge branch 'master' of https://github.com/coverclock/com-diag-telegraph

Conflicts:
	Telegraph/tst/unittest-controller.c

git-svn-id: svn://graphite/telegraph/trunk@74 28fd7c2b-1a77-0410-894e-e36ff7e1493b
Managed to break the base. Oops. Builds and unit test for controller passes.

git-svn-id: svn://graphite/telegraph/trunk@75 28fd7c2b-1a77-0410-894e-e36ff7e1493b
Merge branch 'master' of https://github.com/coverclock/com-diag-telegraph

Conflicts:
	Telegraph/tst/unittest-controller.c