| commit | 1e0a8ea4d53226812a358d22c103daea0dddcfb5 | [log] [tgz] |
|---|---|---|
| author | Harald Welte <laforge@netfilter.org> | Sun Aug 09 19:55:21 2009 +0200 |
| committer | Harald Welte <laforge@netfilter.org> | Sun Aug 09 19:55:21 2009 +0200 |
| tree | 3c7eed70c6fa077d19f1f4785d137cc17ca21be6 | |
| parent | 42581829ec2a79ef82c813b8212da76f514aa4f4 [diff] | |
| parent | 369cc27f3b7da119b41527de14c447f44b4bfaef [diff] |
Merge branch 'master' into config_file Conflicts: openbsc/src/vty_interface.c