Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 3 Jul 2012 17:35:56 +0000 (10:35 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 3 Jul 2012 17:35:56 +0000 (10:35 -0700)
commit350489e4da2cd4cdb88c74e8c644cc0e43c5f28f
tree007241c992c45d44be993f51d1b26cc2235332d2
parentecdd84716509264414a156bef57d30a9f8e9fe1d
parent7c76e73a679321a9a4cc0a93178ee93fbda7aaa6
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2