diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-18 20:22:36 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-18 20:22:36 +0200 |
| commit | e5fefea6ec93746376bf42733ee84a9fafeab764 (patch) | |
| tree | 278691ddc1f63630bcef4f0438e454362271dc03 /methods/server.cc | |
| parent | 1a91569d0a217418596b2c7c3a3af1de77486671 (diff) | |
| parent | 51da0c3587c9d36a3c04b3e28b99d8331a29b230 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
debian/changelog
Diffstat (limited to 'methods/server.cc')
0 files changed, 0 insertions, 0 deletions