commit | b642b3c8e388d0c9a81d18ae183bb62cfd24d434 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Nov 23 21:21:12 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Nov 23 21:21:12 2015 +0000 |
tree | a72efec9e4617bfea8043a5895f9254de7f84742 | |
parent | d63de1e407176bab41c61ad7f3def0e4d0707cdc [diff] | |
parent | 32e510bd70eedbeec8590b9bf786b11430ddaac3 [diff] |
Merge branch 'obsd-master'