Merge remote branch 'upstream/master'

Conflicts:
	mbus/mbus-protocol.c
This commit is contained in:
Stefan Wahren
2012-04-22 19:37:55 +02:00
8 changed files with 177 additions and 51 deletions

3
.gitignore vendored
View File

@ -1,4 +1,7 @@
.project
*~
*.o
*.so
*.la
*.lo
.libs/