commit | 7669cfb330a5fc6341b3dcd0cd600ec6423e4822 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Feb 05 12:01:10 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Feb 05 12:01:10 2016 +0000 |
tree | 0344a4a02800fb320b9bb0e8fe30243fd988c755 | |
parent | 07c23ccc05314f5d351cb70d08a9256e15d105d9 [diff] | |
parent | bc0c9c7920349328ed426a735b999d9dc85fe1f1 [diff] |
Merge branch 'obsd-master'