Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 15 Jun 2012 00:51:56 +0000 (17:51 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 15 Jun 2012 00:51:56 +0000 (17:51 -0700)
commit6755c000f7f89723cb798d61cf0800f47cf3d36b
treece776a4e5f80078a7c0b214d4df5a4b2e5773ebb
parent098430ae39b20cb6ec8322c04f40514d3d468eb2
parent53c21a1af6a61d44b8a71d49570f805c17c0a043
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2