Merge branch 'master' of ase.cs.columbia.edu:halo

Author Jonathan Bell <jbell@cs.columbia.edu>
Author date 2011-11-02 14:57:48
Author local date 2011-11-02 10:57:48 -0400
Committer Jonathan Bell <jbell@cs.columbia.edu>
Committer date 2011-11-02 14:57:48
Committer local date 2011-11-02 10:57:48 -0400
Commit 727c82541bc6f44382f7e94212a3144149a04995
Tree f3ea8da40ed458e6a393a7e439e44adaf40b7385
Parent e4ec6e6364f5f8515e605e1e86a2fd8727f68da9
Parent bd02a43e3cc4806c76399ce8e64053e7fe884f21
Merge branch 'master' of ase.cs.columbia.edu:halo

Conflicts:
	halo-se-feature/feature.xml
	halo-update-site/artifacts.jar
	halo-update-site/content.jar
	halo-update-site/features/edu.columbia.cs.psl.halo.client_1.0.1.4.jar
	halo-update-site/site.xml
Affected files: