commit | e45f42db29b70addec8d1dd9b63dddd31160968c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jul 17 16:01:07 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jul 17 16:01:07 2015 +0100 |
tree | a6e4b9bd23d5b84094f375d256190744c67aaeeb | |
parent | b88639304239f8f46f72fd7fbf10abb45d942f1f [diff] | |
parent | bad8d0fd200c7718a8f51f52b9dd2f23c74d996f [diff] |
Merge branch 'obsd-master'