Merge branch '3.0' - www - Unnamed repository; edit this file 'description' to name the repository.

commit 018f8e3e4ed310ba37d69bac0b9990d33973d389
parent 146d281bfbb0ef02186b4a7acc3142a98df4ad69
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat, 11 Feb 2012 20:49:45 -0500

Merge branch '3.0'

	www Unnamed repository; edit this file 'description' to name the repository.
	Log \| Files \| Refs \| Submodules \| README \| LICENSE