commit | 051cf5437acecf83f27d76c5c12d514ff9d6c283 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 01 10:01:11 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 01 10:01:11 2016 +0000 |
tree | 7ac51a003719553ad7bae5a497b230475368dca7 | |
parent | 5e59c301b7936c58b63ab3603cfe4216ee7e4a54 [diff] | |
parent | 311be04d6155226b5bbdd8f7616d7df0647c2a0d [diff] |
Merge branch 'obsd-master'