| commit | 487285b325fff085e78d1132e99b2d39bfa22897 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Sat Oct 17 20:01:08 2015 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Sat Oct 17 20:01:08 2015 +0100 |
| tree | 031700bdae8cf7604db2ee1528971c5f6c364a32 | |
| parent | 0273d809d0fd087919b61fa90b44f7f3e4f754bf [diff] | |
| parent | 9c601ebde81a3965541161499ebce0b5e5f1122f [diff] |
Merge branch 'obsd-master'