commit | 17f6c3be8eeb0b67d07f916026dab918795c0317 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Oct 31 10:01:12 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Oct 31 10:01:12 2015 +0000 |
tree | 08a10a780a8de977d4452c10a7a9c03db1ae1702 | |
parent | e8bb385d6d9d8a91b5fa78e906531afc02320b80 [diff] | |
parent | 01defc9f4965bb174e1d1295754d5a8695683054 [diff] |
Merge branch 'obsd-master'