commit | df6488a47088ec8bcddc6a1cfa85fec1a462c789 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 16 19:17:31 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 16 19:17:31 2015 +0000 |
tree | cf1bbe106963c4f0201a2edc24f8bc416f74c0ca | |
parent | 66e8811c64a833b759511b3f7309e834155a8442 [diff] | |
parent | 776eef49d8e13b227d25e5d56d4c379b89c4aacb [diff] |
Merge branch 'obsd-master'