Merge branch 'master' of github.com:birarda/hifi

Conflicts:
	interface/CMakeLists.txt
This commit is contained in:
Stephen Birarda 2014-07-16 15:45:59 -07:00
commit 61beb130a1

Diff content is not available