Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 13 Oct 2012 22:16:49 +0000 (15:16 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 13 Oct 2012 22:16:49 +0000 (15:16 -0700)
commit5ad623e760453eda18782986f5c6581bf5f9ab33
treed68d44c5210e3cca1b0685cc18a6a49afc1b9408
parent239f88874b2163182c9044ad9bc1a5962b8d7e6e
parente7cba7ea748984abf25bdff44cc84b4263b5f43b
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2