commit | ce20572ace265e3c457752b34a83bd3c47cd3b40 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Aug 25 18:01:07 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Aug 25 18:01:07 2015 +0100 |
tree | edad207ba9641e6acf8155d46bf1bc9aa444bd7e | |
parent | 429f86397b63e8f93d0ee4a47c9bfb2e621a5ecd [diff] | |
parent | 2ffbd5b5f05dded1564ba32a6a00b0b417439b2f [diff] |
Merge branch 'obsd-master'