commit | 20c3adca41675b30593e39fa6fa9dfda615997ef | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Sep 25 18:01:09 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Sep 25 18:01:09 2015 +0100 |
tree | c834821241b3cae2b5be95db7d6a3e9fb1f26359 | |
parent | b0372840e7461089412a8ddf705533f9f72f1426 [diff] | |
parent | 28f23f18e9d79405a60348c4f7aeded33da9135b [diff] |
Merge branch 'obsd-master'