commit before pull, clean directories
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
adds location.sql to commit before checkout
commit before checkout
remove mapping function in from group_views.py .
resolve merge conflict
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
Server side implementation of group passwords. First draft, not tested
Merge branch 'groupSuggestion' of https://github.com/lca4/unison-recsys into groupSuggestion
Reverted use of groupevents
Merge branch 'master' into groupSuggestion
Merge branch 'groupSuggestion' of git://github.com/lca4/unison-recsys into groupSuggestion
fixed minor python bugs.