commit | 7c94dae702798db66424897159a44832f5dbc392 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Dec 16 22:01:08 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Dec 16 22:01:08 2015 +0000 |
tree | 255b7f4f770c213a787618e92d56fa19066c0c94 | |
parent | f7a6482e6b2f3fec33f87d0c9fe69cfe7efc6daf [diff] | |
parent | 8eb1a7d5dc8d66ca7d17c72e4d8d0e58d6fd2824 [diff] |
Merge branch 'obsd-master'