Zentyal/zentyal — pull request #1400 by javierag (2014-06-26 16:56:43+00:00)
Title: Remove duplicate entries from the custom shell list

Conflicts:
main/users/ChangeLog