commit | 95e304d1113410e1deb5245bfe8d55a1cd44a059 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu May 26 14:01:10 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu May 26 14:01:10 2016 +0100 |
tree | 12702ec5ea655b3bda68a64aedbd4318008671ee | |
parent | 05ec232f3ec567351405f276693735056156527d [diff] | |
parent | cd14ac0486906d607b5ef6ade70460c64aec00cf [diff] |
Merge branch 'obsd-master'