commit | af8134a6ffe8304b6cb1849995f446eab8e53b53 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Dec 08 10:01:16 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Dec 08 10:01:16 2015 +0000 |
tree | 02ada102c67552ff8e9f1ef3c88a096460dd0aaa | |
parent | a988c36ccb7d411d995edfa9dbdb7682295d62a0 [diff] | |
parent | e0f26dcda36dc35741da6047a11efb853b3137d9 [diff] |
Merge branch 'obsd-master'