Merge branch '0.8.x' into 0.9.x

Conflicts:
	lib/common.php
This commit is contained in:
Evan Prodromou 2009-11-07 13:01:24 -05:00
commit 2d8ad0409d

Diff Content Not Available