Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 2 Nov 2012 21:06:58 +0000 (14:06 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 2 Nov 2012 21:06:58 +0000 (14:06 -0700)
commit55f2ab5b6f5aa742283d8ddb021eaf1241be8034
tree9c11a0ddd70db545d2a37b4dccd18081f5cef093
parentf6807fa3ba63f90a1c3e066ccb52edc4ff1ec6f5
parent5a71e1d22bca55975a247b6cb19ddbbe2eb3be90
Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly