Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 30 Jun 2012 04:05:50 +0000 (21:05 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 30 Jun 2012 04:05:50 +0000 (21:05 -0700)
commitecdd84716509264414a156bef57d30a9f8e9fe1d
tree7157ec7b998bbf057363195dd4edb502e41e5add
parent34a53f7c9067275edc3f6b9d04367dd709d42099
parentc2d84054b04ffb303118db10b963d3106e21ab88
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2