Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 00:52:13 +0000 (16:52 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 00:52:13 +0000 (16:52 -0800)
commit07f145049e8f0de848255d7b21ddb64866db0c83
treeced13f29ab6862a1c2ebdbdb9c3eaa4f24b0bd90
parentc498f6e1ba50d8c17cd1d8698f05f7604d5cfcf8
parentce6be4f83624d8c39a93d2b54567cc2f33580812
Merge branch 'master' into testing
lib/default.php