Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 24 Oct 2012 03:29:25 +0000 (20:29 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 24 Oct 2012 03:29:25 +0000 (20:29 -0700)
commit94b98a915ba84699b2a2adab9146fbc2cf617459
tree15acfb8449c27375dfde4220e3f247723281ff6d
parenteb5a70b41c1d89d79455837f8044a8944694f89a
parent181ede861b10c041d4a58ace13b8c84f2d9b5c8a
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2