diff options
| author | Bill MacAllister <whm@dropbox.com> | 2016-01-05 08:18:37 +0000 |
|---|---|---|
| committer | Bill MacAllister <whm@dropbox.com> | 2016-01-05 08:18:37 +0000 |
| commit | 9e1b210844faaa451cee3b9c0afa738120062e79 (patch) | |
| tree | 04dc0116e6db1af234359b2f92bc6c280eb7b2ff /LICENSE | |
| parent | 2a03ce35be9b900cc0fd5f305dec54ebcf3fed5a (diff) | |
| parent | 802e47e8d84530d191817b2d86978a0b09803186 (diff) | |
Merge branch 'master' into ad-keytabs
Conflicts:
NEWS
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions