commit | 07aef385910f46e09804756231ff1ef3e304e023 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jul 13 18:01:09 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jul 13 18:01:09 2015 +0100 |
tree | 934330dfd6943a981ee7a935aa8d818a9ccfadd4 | |
parent | 38d4d696391123da266c9d38ed65bba7076e1147 [diff] | |
parent | e45d624df288d914a1628d373ff245b03f7d600b [diff] |
Merge branch 'obsd-master'