Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 12 Oct 2012 00:22:50 +0000 (17:22 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 12 Oct 2012 00:22:50 +0000 (17:22 -0700)
commit37ea89d6cdc8e7bcad758cedf2305889c7e19e57
treece110ff58725d57caa4dbd0cef537eddb0069251
parentbcff90f20d5c407526e833b406327339cdbc3322
parent4bb41982a6628b79779643d0c83f2732c439aaf8
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2