commit | b25dc423b0b1369aaec5dee8e051d541bd55043f | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Apr 20 15:44:27 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Apr 20 15:44:27 2015 +0100 |
tree | 4ee106369e8b28504959d1b43c56daf89e196240 | |
parent | acb8248ba64e1c9770d39d9790439c74eb9e5d80 [diff] | |
parent | 0fd9a97202dc2878d9cf21f3bea01b599c21e61b [diff] |
Merge branch 'obsd-master'