commit | 5dd0e82809f492c06d9eb20903b70286cb60d856 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Dec 28 16:01:09 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Dec 28 16:01:09 2015 +0000 |
tree | ec09d3666f79ec81b504569e1211b4ff2a4fd974 | |
parent | e15a8a7c4681e4f975d80fc26b9f7c6686c94a9c [diff] | |
parent | 2a1f27eb1af6645209746659b600fc546f725605 [diff] |
Merge branch 'obsd-master'