commit | 06b5805479943fc95cafd01d33252954529ba636 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Jun 13 18:12:49 2013 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Jun 13 18:12:49 2013 +0100 |
tree | 77067fe8c530fb89dbdd0c146ab454b4ba038501 | |
parent | a97d5b8e60b25e2d38603d472f1b0b70e4ef5fa4 [diff] | |
parent | d6debc21c777dc0e993fd7928bbba51075685491 [diff] |
Merge branch 'obsd-master'