Merge branch 'master' of ssh://gerrit.cobaldwins.net:29418/zfs/zfs-snapshot
authorAlan J. Pippin <alan@pippins.net>
Tue, 16 Feb 2016 21:44:24 +0000 (14:44 -0700)
committerAlan J. Pippin <ajp@pippins.net>
Tue, 16 Feb 2016 21:44:24 +0000 (14:44 -0700)

Trivial merge