Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Jun 2012 01:20:17 +0000 (18:20 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Jun 2012 01:20:17 +0000 (18:20 -0700)
commit921f5a3f384eea2309f6e19f791ab970e5808d83
tree1f6e773b68218f9c91b2d8b11b5ce4a1acb2eb64
parenta0ed3c24c92cd8616cf55e46d1776cd2373acb71
parent79bfafa1d2e1ed1744581eceb883a3d7a10349a3
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2