diff options
| author | Marius Halden <marius.h@lden.org> | 2016-08-24 10:08:02 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-08-24 10:08:02 +0200 |
| commit | 942e1d8011536f60a4d2dccf89e4b0e7e25f0602 (patch) | |
| tree | 52a997023e8f57d5c4638371fa37799f7b9b2810 /protocols/purple/purple.c | |
| parent | d1d180e29cf73eda249c8ce0b81fed940ee83130 (diff) | |
| parent | 2dc394c7b0d7dfec1e0a7f553d3510c5efa98086 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/purple/purple.c')
0 files changed, 0 insertions, 0 deletions