| commit | 5e59c301b7936c58b63ab3603cfe4216ee7e4a54 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Thu Dec 31 20:01:09 2015 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Thu Dec 31 20:01:09 2015 +0000 |
| tree | 6e9c71256b5cd1f27ad1783f0c7436af032bbfa7 | |
| parent | 5dd0e82809f492c06d9eb20903b70286cb60d856 [diff] | |
| parent | 7e67db79dca50184ee9dec4456ccf38756201a9e [diff] |
Merge branch 'obsd-master'