{"shas":[["c1d5240623f5e0a96e22c88331e933566da352bf","7db751efdc9afc06cac10fe83c2c7d98c72fef9e@gmail.com","Merge branch 'master' into usuario_empresaXRoles\n\nConflicts:\n\tPeoplePass/src/com/pp/admin/facade/IParamsAdmin.java\n\tPeoplePass/src/com/pp/admin/facade/ParamsAdmin.java","Fredy Sierra"]],"ref":"refs/heads/usuario_empresaXRoles","size":1,"head":"c1d5240623f5e0a96e22c88331e933566da352bf","push_id":40209500}