commit | ccbe2545d9857e03731eddb9757989b9f52dc785 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Dec 03 08:41:08 2014 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Dec 03 08:41:08 2014 +0000 |
tree | ebe4a9fb1310635043e57e0c5586e49f3c2aade9 | |
parent | 3e8efcc555a2767ff0abc121cb3232d7e84c3873 [diff] | |
parent | 54ca7b230d08aae0b2028f3f82a259963017c167 [diff] |
Merge branch 'obsd-master'