Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes ... Conflicts: lib/base.php		2011-07-30 19:40:19 -04:00
..
share.php	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
unshare.php	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
userautocomplete.php	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00