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/test/unsupported-frames/manual_frame5.hex
+++ b/test/unsupported-frames/manual_frame5.hex
@ -1 +0,0 @@
-68 0D 0D 68 53 FE 51 07 79 04 03 02 01 24 40 01 04 95 16
				`@ -1 +0,0 @@`
				`68 0D 0D 68 53 FE 51 07 79 04 03 02 01 24 40 01 04 95 16`