Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 16 May 2012 02:27:39 +0000 (19:27 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 16 May 2012 02:27:39 +0000 (19:27 -0700)
commit16003dcfd2baa152f5dd24794ec9f36e139eaeb8
treee31f781d0bc0d372bb302c2b0b38d0b6adacb20d
parent6d837408693014925cb46bbfd1fcdde5f5e626f2
parent0f9e45de1f4568ab7abde0e8455b3f293d45a9da
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2