tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 1639d72d32b1f724963f307145509a49e87bc51d
parent 29e9d97f196a4390033e537e546579dac3f2ddc9
author Harald Welte <laforge@netfilter.org> 1249840392 +0200
committer Harald Welte <laforge@netfilter.org> 1249840392 +0200

Merge commit 'origin/master'

Conflicts:
	openbsc/src/vty_interface.c