commit | 814e40522cb611895e84fc2aaf58d5d0ca9ba348 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jun 20 12:59:43 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jun 20 12:59:43 2014 +0100 |
tree | 12e56d683fbcadf4d67f8a78acf8afcf1343ba0b | |
parent | 1544c688e6bdc61fec8a96588b2552551753e46b [diff] | |
parent | c8efffb4db5c521640dd5687d2a640ca04664aad [diff] |
Merge branch 'obsd-master'