Merge remote branch 'upstream/master'

Conflicts: mbus/mbus-protocol.c
2012-04-22 19:37:55 +02:00
parent 39e7b64ff4 281394c092
commit df06b93e97
8 changed files with 177 additions and 51 deletions
--- a/mbus/mbus-protocol.h
+++ b/mbus/mbus-protocol.h
@ -520,6 +520,7 @@ char *mbus_frame_data_xml(mbus_frame_data *data);

 char *mbus_data_variable_header_xml(mbus_data_variable_header *header);

+char *mbus_frame_xml(mbus_frame *frame);

 //
 // Debug/dump