Merge branch 'master' into sms

Conflicts:
	openbsc/include/openbsc/transaction.h
	openbsc/src/gsm_04_11.c
	openbsc/src/transaction.c
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.