2 Commits

Author	SHA1	Message	Date
Stefan Wahren	5a7e69f90d	Merge remote branch 'upstream/master' ... Conflicts: mbus/mbus-serial.c	2012-05-14 00:09:05 +02:00
Robert	c10b37e53d	got rid of duplicate catalog libmbus/libmbus	2012-04-15 10:51:15 +09:00