tworrall fb483663bf merging r10056 to the trunk		2012-09-19 15:25:42 +00:00
..
cornell/mannlib	merging r10056 to the trunk	2012-09-19 15:25:42 +00:00
ucsf/vitro/opensocial	Merge from 1.5 branch: NIHVIVO-3954 Add OpenSocial bug fixes from Eric Meeks: make compound key in app_registry table, show sandbox login, ensure that randomly assigned Gadget ID is not negative, modify JS to find out whose page we are on.	2012-09-07 15:41:57 +00:00