commit | 7e9b87f396e117828c0db9dd53f4b01a82f35640 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Sep 23 00:01:09 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Sep 23 00:01:09 2015 +0100 |
tree | 0a047f2745733a8b4435553ab5bd454422d25780 | |
parent | d6d05883adb414cc3c615ef65aebc323b3b37eef [diff] | |
parent | dc66795e353e1d84c23cb87f4120480a152b43d9 [diff] |
Merge branch 'obsd-master'