Merge remote-tracking branch 'illumos-gate/master'
commit154d69dbe83263a5d6618e8e24e1fd72372f2bdb
authorToomas Soome <tsoome@me.com>
Fri, 15 Jul 2016 15:57:00 +0000 (15 18:57 +0300)
committerToomas Soome <tsoome@me.com>
Fri, 15 Jul 2016 15:57:00 +0000 (15 18:57 +0300)
treeadafee9efa9f38984d41ac6593d77a3897c153af
parent6df143bd4189c26737f249d3dfc597514053aa7e
parent4b5c8e93cab28d3c65ba9d407fd8f46e3be1db1c
Merge remote-tracking branch 'illumos-gate/master'