| commit | 13808ccedec226db127c3419ee8c53b6eabb9cd9 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Thu Jun 04 11:17:39 2015 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Thu Jun 04 11:17:39 2015 +0100 |
| tree | 96c5cc5d48008cc86a0201eab8c65edd53ee9f78 | |
| parent | 75b70be4a6444f1a44a538a18f499f66156579a3 [diff] | |
| parent | a3edfd9e84f4f8e9b74425cdc4b00fe9cb3d0ba6 [diff] |
Merge branch 'obsd-master'