commit | 73185d17928956e6fca557b23cf99f8ebd65e5c9 | [log] [tgz] |
---|---|---|
author | Harald Welte <laforge@gnumonks.org> | Sat Aug 08 16:08:54 2009 +0200 |
committer | Harald Welte <laforge@gnumonks.org> | Sat Aug 08 16:08:54 2009 +0200 |
tree | 0f8bad6211e80ab17ef425b8d35107c6d6704028 | |
parent | c0bdedb1e7acbca8e6f019e0818a74713351d04c [diff] | |
parent | 97b1fe3f58f2f47d2b96012e1de51e63f48b3285 [diff] |
Merge branch 'master' into config_file Conflicts: openbsc/src/vty_interface.c