a995f4e523358929fe254d691ecc694b8a55adf9 c7490a2fa2cf4806ccf453a06feb4d354e19da5e Stephen Bartholomew steve@curve21.com http://github.com/stevebartholomew/staticmatic/commit/aafdef05c5926a6c2c08cd1d6e2cce020e92b656 aafdef05c5926a6c2c08cd1d6e2cce020e92b656 2008-06-16T12:49:53-07:00 2008-06-16T12:49:53-07:00 Fixed config branch conflicts cd76bbd2e09df5be1ea73f3c934024c1201fb541 Stephen Bartholomew steve@curve21.com