commit | 7b9c0ced21db06e254f3b23a45b99fc66d85afc5 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Apr 26 12:01:09 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Apr 26 12:01:09 2016 +0100 |
tree | abdba21747608563538a7993e21fafb2cb3d2836 | |
parent | 819ad1a007968fd5ab8e850deea04f36c7caa64f [diff] | |
parent | fb1c929dc6d153c5048c905467db2915e38d0e54 [diff] |
Merge branch 'obsd-master'