commit | 02e348c069b9f49b44344281276b81fe537b3c8b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Jun 04 12:59:41 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Jun 04 12:59:41 2015 +0100 |
tree | 889ef55ab3da4ba5e3a8fe6aa7c3cb5708cdd724 | |
parent | 1de74e27e535b3e294c265974973a7743c8374a0 [diff] | |
parent | a863834574ec02b87ff0e7245ef31f0d4543ab34 [diff] |
Merge branch 'obsd-master'