Merge branch 'warthog9'
authorJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Sat, 12 Sep 2009 00:40:56 +0000 (17:40 -0700)
committerJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Sat, 12 Sep 2009 00:40:56 +0000 (17:40 -0700)
commit4b8394fe77ae5ae1197e4ce0c5b3e3c3da0ccc76
tree08690c0a265a5012a118a9121aee61ea3746058d
parent19f1c96883e8e3e78747bc6fbf5af2bac0f76dae
parent7c8a909f1b4bf916108854f965e38d1bdd365228
Merge branch 'warthog9'

Conflicts:
config
config