Merge branch 'quick_tests'
authorTimothy Manning <tfhmanning@gmail.com>
Fri, 26 Nov 2010 00:50:43 +0000 (13:50 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Fri, 26 Nov 2010 00:50:43 +0000 (13:50 +1300)
commit9032d048555cb5b86ff8c1b4319a856b43331377
tree0bab7d9553824631c8668ccb2b7f026239a5b573
parent43dffe06bde0c8c1e6c6a76fe140bc287f2acad4
parent7897e76da06203d6e2c20f13a1ce79e64809930a
Merge branch 'quick_tests'