Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorJohn Marino <draco@marino.st>
Sat, 30 Apr 2011 20:38:01 +0000 (22:38 +0200)
committerJohn Marino <draco@marino.st>
Sat, 30 Apr 2011 20:38:01 +0000 (22:38 +0200)
commit46e06a729e9f4f054c9af72bf7fbdde1f3b288fb
treef90868088e991c7a36ea187cd565475f80d473fb
parentea47786f593951711c20c91893bc1346804cd893
parenta1a824355ccfffd46912403a6793203f5026f37e
Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly