Merge branch 'quick_tests'
authorTimothy Manning <tfhmanning@gmail.com>
Sun, 14 Nov 2010 23:20:53 +0000 (12:20 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Sun, 14 Nov 2010 23:20:53 +0000 (12:20 +1300)
commit6356b32783a8ec97b09f7090c3d10c8b88ea32e5
treed4089bd44924071c2afe72a9486c65919361556e
parentde55d14d486fdf4069153df3aba0957e62745490
parenta32621e0d7f5f391e9152cfe710fa6c99ca44c50
Merge branch 'quick_tests'