commit | 4909a7017494f7483cfd2180913ad78f87bc9d62 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Dec 11 13:24:45 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Dec 11 13:24:45 2015 +0000 |
tree | 1e607e3a0d6d1f8872bae01fc8941aaaab1a2108 | |
parent | af8134a6ffe8304b6cb1849995f446eab8e53b53 [diff] | |
parent | d7e11d0af78bacc7722998509ac93be7fcffc7b4 [diff] |
Merge branch 'obsd-master'