Merge commit 'origin/master'

Conflicts:
	openbsc/src/vty_interface.c
This commit is contained in:
Harald Welte 2009-08-09 19:53:12 +02:00
commit fccd9e3d6f

Diff Content Not Available