tree 0f8bad6211e80ab17ef425b8d35107c6d6704028
parent a08a9acdb6bff0ee4fdf0f58b78b6525017a1f9f
parent dc2c029098b7d1f216b2dc2654bd43253731b228
author Harald Welte <laforge@gnumonks.org> 1249740534 +0200
committer Harald Welte <laforge@gnumonks.org> 1249740534 +0200

Merge branch 'master' into config_file

Conflicts:
	openbsc/src/vty_interface.c