From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Wed, 24 Oct 2012 16:54:30 +0000 (-0700)
Subject: Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository... 
X-Git-Tag: v3.4.0rc~989
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/3a6a85bc47bb0942419001ac35772cc2accc438c

Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2
---

3a6a85bc47bb0942419001ac35772cc2accc438c