diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2014-02-06 16:47:43 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2014-02-06 16:47:43 +0100 |
| commit | f48fa14214301382b2e6b134788a7506b61b664f (patch) | |
| tree | 9343862465641a2307027a94d7734e622dddd9cc /conf/confbase.Y | |
| parent | 6601a14831cdd32fc671ebc9dc299d2be427e489 (diff) | |
| parent | 300e4008f02382b87409dabb52a317b8336de55b (diff) | |
Merge commit 'origin/master' into socket
Diffstat (limited to 'conf/confbase.Y')
0 files changed, 0 insertions, 0 deletions