commit | eb5ee80c74ceded14194ac86d1c42e86547c3642 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Dec 01 10:01:13 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Dec 01 10:01:13 2015 +0000 |
tree | 0fe7ad8f105adb20221cce21d329f4ad222dabe7 | |
parent | 742976893e80a6f40a333e1ebfe797789030dfe6 [diff] | |
parent | a785a7f7005761a3ab52b8c336e1ff5881eb7d83 [diff] |
Merge branch 'obsd-master'