Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 13 Jun 2012 01:42:27 +0000 (18:42 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 13 Jun 2012 01:42:27 +0000 (18:42 -0700)
commit063b119abbc0884b488a4191f800cf331c3be529
tree8662089b038d326972c79284b4f608c3c503e076
parentbfc3a7b1a6cc1c380d88b1a095076132618294d7
parent7d235eb54de15330b69dcdeca5c99604aeea12d1
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2