commit | 9a0ce98c54897f042f4fd3eced6503397f3aa5d2 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jul 06 16:01:10 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jul 06 16:01:10 2015 +0100 |
tree | f55b7ee81e575c46baad615bd845a1ad7991c7f8 | |
parent | 78723af99f52251aec11d586a507e34b5d0fcaf6 [diff] | |
parent | b298478435c2e32b788566d1fab93dee1b71ff60 [diff] |
Merge branch 'obsd-master'