briancaruso 367225de91 Merge from 1.5-maint		2012-09-21 18:28:21 +00:00
..
cornell/mannlib	Merge from 1.5-maint	2012-09-21 18:28:21 +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