Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 8 Jun 2012 06:51:41 +0000 (23:51 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 8 Jun 2012 06:51:41 +0000 (23:51 -0700)
commit8d0123f0e071b245ccaa78862dd3a8335416b6ad
treef251ba3a07b61d2704e222f1254b86015a708048
parentecc33e7178ca3b73022dd38decc9c7c1277752ec
parent397ffc5c7738df5bbb8b5e0a96e5b4b00b829a13
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2