Fix hardcoded paths in ztest
Merge remote-tracking branch 'upstream/master' into master_clean
Merge branch 'master_clean' of https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
zfs-0.6.0-rc14, spl-0.6.0-rc14
Add foreman rubygem
Add sinatra-1.3.2 rubygem
Add uuid rubygem
Add aws-sdk gem
Add thin rubygem
add swfmill-0.3.2
Julia: update/fix
Merge pull request #298 from iyzsong/swfmill

add swfmill-0.3.2
Fixing xlaunch for systemd branch
Added gcovr 2.4
python-linkme-wrapper: optimize some escaping
pydb: mirror://sourceforge.net/ is no longer valid
Merge pull request #302 from aristidb/pydb

pydb: mirror://sourceforge.net/ is no longer valid
Merge pull request #294 from jcumming/zfs.130201

zfs-0.6.0-rc14. spl-0.6.0-rc14