tree 3c7eed70c6fa077d19f1f4785d137cc17ca21be6
parent 6286888019c67e2e24c47cf33f6f9639d196ea5e
parent 2a7dedca1099ca165eda377168b6aa606a550681
author Harald Welte <laforge@netfilter.org> 1249840521 +0200
committer Harald Welte <laforge@netfilter.org> 1249840521 +0200

Merge branch 'master' into config_file

Conflicts:
	openbsc/src/vty_interface.c