tree 7791f62da62918e03cfd2f17a966d30376c1c231
parent e87eb46ecc8e6965123b567cdd0c7865fe43ac12
parent cddb98026561790cc314146eb87938a2d9c1a881
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