diff options
| author | Marius Halden <marius.h@lden.org> | 2018-05-31 12:26:07 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2018-05-31 12:26:07 +0200 |
| commit | caecc6deb160813d084e0a94099b42f434f7d9c9 (patch) | |
| tree | 29df7bc72c79d01653b5fe87085477bf3c7c3637 /bitlbee.c | |
| parent | db02ac8971379f9fee2f3a618bb08b8076d1a83d (diff) | |
| parent | 49ab3cbbe3d8a92cced850dac46dec671433c5da (diff) | |
Merge branch 'master' into patched-masterHEADpatched-master
Diffstat (limited to 'bitlbee.c')
0 files changed, 0 insertions, 0 deletions