commit | 21a2ccc5f16be454ed7a2fd47e65a51d5faa4597 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Jun 17 20:01:12 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Jun 17 20:01:12 2015 +0100 |
tree | 8e58252b5da492a2e4e0ed5fdc35e098ca05bfc1 | |
parent | a584e11d6bb5d2ab0e0476f6c1a821e865597053 [diff] | |
parent | 84f0622c852761a2d6688e944bc01a03af78c52a [diff] |
Merge branch 'obsd-master'