From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Wed, 24 Oct 2012 03:29:25 +0000 (-0700)
Subject: Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository... 
X-Git-Tag: v3.4.0rc~990
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/94b98a915ba84699b2a2adab9146fbc2cf617459

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

94b98a915ba84699b2a2adab9146fbc2cf617459