Merge branch 'reduce-loading' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 14:34:29 +0000 (15:34 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 14:34:29 +0000 (15:34 +0100)
commitfaf1a9422b2bfd52d35652d020fd6931bb19386f
tree31528a689f69396f7e195d0f068aa0bc8e4f7d2e
parent18338415117c61708e349222af566a09a9b490d6
parentedc855dd691b472f36007fc8492e0f70e3301c60
Merge branch 'reduce-loading' into next