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

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

1acfc0a6ed3e4109fb991d7df7a0754099206826