Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 8 Aug 2012 16:29:57 +0000 (09:29 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 8 Aug 2012 16:29:57 +0000 (09:29 -0700)
commitcb134596e1626f361411b5da3a6a5f113c471648
treea7427e91987bab680d84bd666a2a7f16676b8de2
parent02454b3e8645dc6a4eab40490ef946de38868c98
parent0978195f8db09b97dd197b0a28205c940e63f8c7
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2