commit | b5d789a53167552e355848ecfec100cb70b61d97 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Sep 14 16:01:08 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Sep 14 16:01:08 2015 +0100 |
tree | e13896fd562fce8bf58a2b48da9023ace05f6057 | |
parent | 166aa97f75d01dababc94c78b8ca1192479166a7 [diff] | |
parent | 16ee4de5df3c31e362ed095e3feae1b504ddf1c5 [diff] |
Merge branch 'obsd-master'