commit | 00471dc78358bde092df65de5e2c375bf9be7437 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed May 13 09:44:11 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed May 13 09:44:11 2015 +0100 |
tree | 4db96614bbc7e70dcdeaa307a3280103beee2f9e | |
parent | 4165ed96f8f0c494c7bd4f793176e508b6b6581d [diff] | |
parent | 3f4ee98162cd5bb7000f93fec0e631e123b1281d [diff] |
Merge branch 'obsd-master'