Merge branch 'master' of git://github.com/yuhu-/ebusd

Conflicts:
	src/lib/ebus/data.cpp
	src/lib/ebus/data.h
	src/lib/ebus/test/test_data.cpp

src/lib/ebus/data.h

@@ -26,10 +26,6 @@
 #include <vector>
 #include <map>
 
-namespace libebus
-{
-
-
 /** the message part in which a data field is stored. */
 enum PartType {
 	pt_template,   // special part type for templates (relative offset)
@@ -501,6 +497,4 @@ protected:
 };
 
 
-} //namespace
-
 #endif // LIBEBUS_DATA_H_