Merge branch 'master' of ssh://69.25.196.28:822/srv/git/moonshot-ui

diff --cc Makefile.am
index 57ea154,e5454a5..99e3392
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -142,7 -137,7 +142,7 @@@ examples_client_CPPFLAGS = $(libmoonsho
  examples_client_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
  
  tests_basic_SOURCES = tests/basic.c
--tests_basic_CPPFLAGS = $(libmoonshot_CFLAGS) $(AM_CPPFLAGS)
++tests_basic_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
  tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la $(moonshot_LIBS)