Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 17 Aug 2012 19:39:51 +0000 (12:39 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 17 Aug 2012 19:39:51 +0000 (12:39 -0700)
commit3113ad8c08eec305eaded60c69c64ebd78bf26f4
treee18286d99087f860939ded07e00ff4c4108e4ed7
parent9ddf57c0a30b6406c14f35dc2e25d69002ba7e4d
parentaaa576552b475dd91f4433c99d494f3008753e98
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2