Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@pobox.com>

Thu, 28 Oct 2010 23:26:34 +0000 (16:26 -0700)

committer Brion Vibber <brion@pobox.com>

Thu, 28 Oct 2010 23:26:34 +0000 (16:26 -0700)
author Brion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 23:26:34 +0000 (16:26 -0700)
committer Brion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 23:26:34 +0000 (16:26 -0700)
diff --cc README
Simple merge
diff --cc actions/apiaccountupdatedeliverydevice.php
Simple merge
diff --cc classes/User.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Thu, 28 Oct 2010 23:26:34 +0000 (16:26 -0700)
committer	Brion Vibber <brion@pobox.com>
	Thu, 28 Oct 2010 23:26:34 +0000 (16:26 -0700)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
actions/apiaccountupdatedeliverydevice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history