| commit | 742976893e80a6f40a333e1ebfe797789030dfe6 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Sun Nov 29 18:01:08 2015 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Sun Nov 29 18:01:08 2015 +0000 |
| tree | 2d0d57b497b7df3d7177e6e36bad88ceb44c3ce0 | |
| parent | 9fe8b28746faa5d38c25853449127d526beac8f9 [diff] | |
| parent | 1d331c7e6263826e92bb22824d97d781106d0e51 [diff] |
Merge branch 'obsd-master'